Merge ~chad.smith/ubuntu/+source/update-notifier:xenial-esm-product-url-renaming into ubuntu/+source/update-notifier:ubuntu/xenial-proposed

[Chad Smith]

Cherry-pick changes from master for ESM product name and doc url updates, fix package pep8/lint issues due to cherry-picks/backport.

-- xenial only
- 9e0f7ee50 Xenial only backport of pep8 fixes INSTALL, data/hooks.py, tests/test_package-data-downloader.py

-- xenial and bionic only

- af28cd4d6 - verbiage about package counts
    - packages can be updated -> updates can be installed immediately

- 6794d0f3d
    * data/apt_check.py, data/package-data-downloader, tests/test_pep8.py:
      - update the code formating to be not hit W504 warnings,
        change to ignore W503 and be consistent with update-manager.

- f881447e2: Fix E117 over-indented pep issues
    * INSTALL, data/hooks.py, tests/test_package-data-downloader.py

-- X, B, F and G
f8bc3fb7cb70bceb91c25a4d132c6bb410b7a529 (tests)
769f6c83d1b81285595c1a3e48c3c88259156968 (ESM apt URL and product rename)

debian/changelog two entries for upload:

update-notifier (3.168.12) xenial; urgency=medium

  * data/apt_check.py: Update UA Infra: ESM product name and doc url
    (LP: #1901627)
    - data/apt_check.py: Update name and URL
    - tests/test_motd.py: adapt unittests to match new behavior
    - po/*.po: translation files with intltool-update -r
  * Fix pep8 autopkgtest failures (LP: #1906436)
    - d/control: add expilicit pep8 build-requires dependency
    - data/apt_check.py: fix over-indent pep8 errors
    - data/apt_check & data/backend_helper: resolve underindent pep8 issues
      backport of 9e0f7ee50 [ Brian Murray ]
    - data/apt_check.py, data/package-data-downloader, tests/test_pep8.py:
      + update the code formating to be not hit W504 warnings,
        change to ignore W503 and be consistent with update-manager.
        [ Andrea Azzarone ]
    - INSTALL, data/hooks.py, tests/test_package-data-downloader.py:
      Fix E117 over-indented pep issues. [ Gianfranco Costamagna ]

 -- Chad Smith <email address hidden> Mon, 30 Nov 2020 15:34:10 -0700

update-notifier (3.168.11) xenial; urgency=medium

  [ Julian Andres Klode ]
  * Handle missing cases of LP: #1822340, where we told people ESM is not
    enabled, but not how to enable it.
  * Fix multiple disabled ESM repositories being counted as enabled ones.

  [ Brian Murray ]
  * data/apt_check.py: modify wording and output regarding ESM support.
    (LP: #1842508)

  [ Andreas Hasenack ]
  * data/apt_check.py: Update ESM security pockets names (LP: #1881632)
    - the UbuntuESM pocket was renamed from <distro>-security to
      <distro>-infra-security
    - new origin UbuntuESMApps, with a corresponding pocket of
      <distro>-apps-security

 -- Chad Smith <email address hidden> Tue, 29 Sep 2020 17:41:19 -0600

For testing, this changeset has been uploaded to the following PPA:
sudo add-apt-repository ppa:chad.smith/sru-update-notifier-1901627

Test instructions:

1. Obtain a copy of your ubuntu advantage token from https://ubuntu.com/advantage and provide it to sru.sh

#!/bin/bash
#
# SRU Verification update-notifier + ubuntu=advantage-tools
# Test procedure:
# - launch container Trusty, Xenial or Bionic
# - Install ubuntu-advantage-tools from https://launchpad.net/~ua-client/+archive/ubuntu/proposed which supports esm on trusty, xenial, bionic, and focal
# - Attach container to UA subscription (which activates the ESM APT repos
# - run apt_check --human-readable to assert ESM pkg counts ARE NOT reported
# - Upgrade update-notifier to -proposed
# - re-run apt_check --human-readable to assert ESM pkg counts ARE reported

set -e
UA_TOKEN=$1
if [ -z "$1" ]; then
 echo "Usage: $0 <contractTOKEN>"
 exit 1
fi
# sources:
# ua.proposed:
# source: deb http://ppa.launchpad.net/canonical-server/ua-client-daily/ubuntu \$RELEASE main
# keyid: 94E187AD53A59D1847E4880F8A295C4FB8B190B7

cat > test-un.yaml <<EOF
#cloud-config
ssh_import_id: [chad.smith]
package_update: true
package_upgrade: true
apt:
  sources:
      ua.proposed:
          source: deb http://ppa.launchpad.net/ua-client/staging/ubuntu \$RELEASE main
          keyid: 6E34E7116C0BC933
EOF

wait_for_boot() {
  local vm=$1 release=$2
  echo "--- Wait for cloud-init to finish"
  sleep 5
    lxc exec ${vm} -- cloud-init status --wait --long
}

for release in xenial; do
  echo "--- BEGIN $release update-notifier testing"
  vm=test-sru-$release
  echo "--- Launch cloud-init with ppa:ua-client/proposed enabled"
  lxc launch ubuntu-daily:${release} ${vm} -c user.user-data="$(cat test-un.yaml)"
  wait_for_boot ${vm} ${release}
  echo "--- Attach Ubuntu-Advantage, enabling services"
  lxc exec ${vm} -- ua attach ${UA_TOKEN}
  echo "--- Install a downgraded hello package which ESM-focal delivers"
  lxc exec ${vm} -- apt-get install hello=2.10-2ubuntu2
  echo "--- Expect 0 upgradable packages for MOTD from apt_check before upgrade"
  lxc exec ${vm} -- /usr/lib/update-notifier/apt-check --human-readable
  lxc exec ${vm} -- /usr/lib/update-notifier/apt-check --human-readable | grep '0 of these updates are security updates' && echo "SUCCESS: found 0 ESM security updates pre-upgrade" || echo "FAILURE: did not find expected 0 ESM security updates"
  echo "--- Upgrade update-notifier from PPA"
  lxc exec ${vm} -- add-apt-repository ppa:chad.smith/sru-update-notifier-1901627 --yes
  lxc exec ${vm} -- apt-get update
  lxc exec ${vm} -- apt-get install update-notifier-common
  echo "--- Expect non-zero upgradable packages for MOTD from apt_check AFTER upgrade"
  lxc exec ${vm} -- /usr/lib/update-notifier/apt-check --human-readable | grep '1 of these updates is a security update' && echo "SUCCESS: found 1 ESM security updates pre-upgrade" || echo "FAILURE: did not find expected 1 ESM security updates"
done

[Bryce Harrington (bryce)]

Just taking a quick look atm. Looks like mainly this is string changes, which should be safe. If you can wait to next week I can assist with getting the SRU+packages finalized & uploaded

[Christian Ehrhardt  (paelzer)]

SRU pre-req - All three commits are in 3.192.36 which is in hirsute

 update-notifier | 3.192.36 | hirsute | source, amd64, arm64, armhf, ppc64el, riscv64, s390x

Xenial is at
 update-notifier | 3.168.11 | xenial-proposed | source, amd64, arm64, armhf, i386, powerpc, ppc64el, s390x
You base on
pkg/import/3.168.11
=> OK

Please do mind that 3.168.11 didn't leave proposed yet.
You'll want that to happen before you upload this one.
Please clear https://bugs.launchpad.net/ubuntu/+source/update-notifier/+bug/1881632 and verify it for X/B/F to get completed.
If this is intentional (both changes shall land at once) - then please let me know, we'll need to buildpkg the changes file accordingly on an upload to include both versions. But in any way 1881632 will have to be verified sooner or later.

^^ needs info

The changelog IMHO doesn't mention all changes:

- For example the unittest changes.
  Since it is a sub-element of the URL rename you can list it as that like:
    * data/apt_check.py: Update UA Infra: ESM product name and doc url
      (LP: #1901627)
      - data/apt_check.py: Update name and URL
      - tests/test_motd.py: adapt unittests to match new behavior

The update to the translations looks correct, but has nothing to do with the URL/Rename.
Therefore it will IMHO need an extra bug that describes "why it has to be SRUed" and "how it shall be verified". If I miss how this is tied to the rename, then explain on the existing bug 1901627 why it is needed for it.

The bug 1901627 for the rename shows current and expected messaging (ok).
But it misses the steps how to trigger that output (it is MOTD; but are there also other ways, do I need to run an update after upgrading, ...)
In general you'll need to add a proper SRU template (https://wiki.ubuntu.com/StableReleaseUpdates#SRU_Bug_Template) to the bug unless you have a special exception. If you do so, then follow whatever this defines, but mention and link it in the bug.
It will likely need also a good paragraph why such a "messaging only" justifies an SRU. I know it is important from the Product POV, but you'll have to make that case in the SRU section of the bug.

review: Needs Fixing

[Chad Smith (chad.smith)]

thanks Christian. I verified and rejected Xenial Bionic and Focal because both Xenial and Bionic introduced pep8 style errors that broke autopkg tests. Since I'll need to SRU to focal again anyway, I rejected the lot. So, this upload debdiff will have to include the two most recent debian changelog entries for release (and related commits).

I'll be force pushing and correcting this PR today for X, B F and G.

[Chad Smith (chad.smith)]

Christian and Bryce. I have updated xenial bionic focal and groovy upload requests, fixing the pep8/style checks on xenial and bionic that were causing autopkgtest failures on both Xenial and Bionic.

I am updating an SRU template on each bug related to this upload request, and the debian/changelog referenced in the upload will need to represent two version increments for Xenial, Bionic and Focal. Since Groovy wasn't queued (and rejected) from -proposed, groovy only needs to represent 3.192.35.

[Christian Ehrhardt  (paelzer)]

Bug 1901627 now has proper test steps - that former need is fixed.

You also explained on the same bug why you need to update the translations (thanks).
But if it it is indeed a change for the same overall cause then instead of:

870 + * data/apt_check.py: Update UA Infra: ESM product name and doc url
871 + (LP: #1901627)
872 + - data/apt_check.py: Update name and URL
873 + - tests/test_motd.py: adapt unittests to match new behavior
874 + * po/*.po: translation files with intltool-update -r

it should be

870 + * data/apt_check.py: Update UA Infra: ESM product name and doc url
871 + (LP: #1901627)
872 + - data/apt_check.py: Update name and URL
873 + - tests/test_motd.py: adapt unittests to match new behavior
874 + - po/*.po: translation files with intltool-update -r

---

Furthermore we now have (in B&X) some changes to fix up autopkgtests.
Those are mixed again and should be grouped along an SRU purpose.
E.g. file a new bug for the autopkgtest issues (explain when they will trigger, maybe a link to an old fail, and that it will be sufficiently verified by the autopkgtests being good on the upload). Especially important on this bug is to outline why it will not have regression potential - e.g. "we are only fixing debian/test/ that isn't active on the users system and therefore has no regression impact". But if you do fix other things (e.g. you change data/apt_check.py) - then you need to elaborate on this bug why it is:
a) needed to SRU this (why wasn't it a problem before, ...)
b) what regression risks are
d) how to verify
I'd recommend to group all those changes in the cahngelog as well.
From:

[ Julian Andres Klode ]
* data/apt_check.py: Update package messaging
  "packages can be installed" -> "updates can be installed immediately"

[ Brian Murray ]
* data/apt_check & data/backend_helper: resolve underindent pep8 issues
  backport of 9e0f7ee50

[ Andrea Azzarone ]
* data/apt_check.py, data/package-data-downloader, tests/test_pep8.py:
  - update the code formating to be not hit W504 warnings,
    change to ignore W503 and be consistent with update-manager.

[ Gianfranco Costamagna ]
* INSTALL, data/hooks.py, tests/test_package-data-downloader.py:
  Fix E117 over-indented pep issues.

To maybe:

* Fix pep8 issues breaking autopkgtest NOW NEEDED BECAUSE OF TODO (LP: #BUG-TODO)
  - data/apt_check & data/backend_helper: resolve underindent pep8 issues
    backport of 9e0f7ee50 [ Brian Murray ]
  - data/apt_check.py, data/package-data-downloader, tests/test_pep8.py:
    - update the code formating to be not hit W504 warnings,
      change to ignore W503 and be consistent with update-manager.
    [ Andrea Azzarone ]
  - INSTALL, data/hooks.py, tests/test_package-data-downloader.py:
    Fix E117 over-indented pep issues. [ Gianfranco Costamagna ]

Again anyone looking at it will
a) see and be able to verify that all these changes belong to the scope of one "issue"
b) can check the bgu for details on reasoning, verification and potential impact

----

That finally leaves:

[ Julian Andres Klode ]
* data/apt_check.py: Update package messaging
  "packages can be ins...

review: Needs Fixing

[Chad Smith (chad.smith)]

Thanks again Chistian/Bryce:
 I have now performed the following for this Xenial branch. If acceptable, I will apply these changes to bionic as well.

   - Filed pep8 SRU process bug and added SRU test details: (LP: #1906436)
  - Drop the unrequired messaging changes from this commit
[ Julian Andres Klode ]
* data/apt_check.py: Update package messaging
  "packages can be ins...

 - d/changelog: reorganized entries under Fix pep8 autopkgtest failures (LP: #1906436)
 - d/changelog: pulled - po/*.po: translation files with intltool-update -r into scope of (LP: #1901627)

[Christian Ehrhardt  (paelzer)]

I don't want to send you re-doing things again :-/
So I've updated bug 1906436 on my own to match the required SRU format - I hope you don't mind.

[Christian Ehrhardt  (paelzer)]

This almost LGTM now
What we have discussed now is good, but you added further changes without mentioning. (The changes are ok, but you need to mention them so that everyone is aware and later people can trace it back)
- two changelog updates are left
  a) you have
    - INSTALL, data/hooks.py, tests/test_package-data-downloader.py:
      Fix E117 over-indented pep issues. [ Gianfranco Costamagna ]
    The comment above matches ac0efb8ee21, but then 256bd2635e appears left being unmentioned
    So IMHO you'd need to add another line like:
    - data/apt_check.py: fix over-indent pep8 errors
  b) commit c1a57c8e09 is ok, but you'll need in changelog
    - d/control: add explicit pep8 build-requires dependency
- Optional: squash the two changelog commits that you have

review: Approve

[Chad Smith (chad.smith)]

Excellent thanks a lot for this review work Christian!

[Christian Ehrhardt  (paelzer)]

LGTM now, thanks for all the re-works and sorry for the trouble I caused you.
But the thought is that it now will be a much better SRU than it otherwise would have been ...

review: Approve

[Christian Ehrhardt  (paelzer)]

To ssh://git.launchpad.net/ubuntu/+source/update-notifier
 * [new tag] upload/3.168.12 -> upload/3.168.12

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading update-notifier_3.168.12.dsc: done.
  Uploading update-notifier_3.168.12.tar.xz: done.
  Uploading update-notifier_3.168.12_source.buildinfo: done.
  Uploading update-notifier_3.168.12_source.changes: done.
Successfully uploaded packages.

diff --git a/INSTALL b/INSTALL
index 2099840..8865734 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
-Inc.
+   Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software
+Foundation, Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -12,97 +12,96 @@ without warranty of any kind.
 Basic Installation
 ==================
 
-   Briefly, the shell command `./configure && make && make install'
+   Briefly, the shell command './configure && make && make install'
 should configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
+more-detailed instructions are generic; see the 'README' file for
 instructions specific to this package.  Some packages provide this
-`INSTALL' file but do not implement all of the features documented
+'INSTALL' file but do not implement all of the features documented
 below.  The lack of an optional feature in a given package is not
 necessarily a bug.  More recommendations for GNU packages can be found
 in *note Makefile Conventions: (standards)Makefile Conventions.
 
-   The `configure' shell script attempts to guess correct values for
+   The 'configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
+those values to create a 'Makefile' in each directory of the package.
+It may also create one or more '.h' files containing system-dependent
+definitions.  Finally, it creates a shell script 'config.status' that
 you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
+file 'config.log' containing compiler output (useful mainly for
+debugging 'configure').
 
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
+   It can also use an optional file (typically called 'config.cache' and
+enabled with '--cache-file=config.cache' or simply '-C') that saves the
+results of its tests to speed up reconfiguring.  Caching is disabled by
+default to prevent problems with accidental use of stale cache files.
 
    If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
+to figure out how 'configure' could check whether to do them, and mail
+diffs or instructions to the address given in the 'README' so they can
 be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
+some point 'config.cache' contains results you don't want to keep, you
 may remove or edit it.
 
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
+   The file 'configure.ac' (or 'configure.in') is used to create
+'configure' by a program called 'autoconf'.  You need 'configure.ac' if
+you want to change it or regenerate 'configure' using a newer version of
+'autoconf'.
 
    The simplest way to compile this package is:
 
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.
+  1. 'cd' to the directory containing the package's source code and type
+     './configure' to configure the package for your system.
 
-     Running `configure' might take a while.  While running, it prints
+     Running 'configure' might take a while.  While running, it prints
      some messages telling which features it is checking for.
 
-  2. Type `make' to compile the package.
+  2. Type 'make' to compile the package.
 
-  3. Optionally, type `make check' to run any self-tests that come with
+  3. Optionally, type 'make check' to run any self-tests that come with
      the package, generally using the just-built uninstalled binaries.
 
-  4. Type `make install' to install the programs and any data files and
+  4. Type 'make install' to install the programs and any data files and
      documentation.  When installing into a prefix owned by root, it is
      recommended that the package be configured and built as a regular
-     user, and only the `make install' phase executed with root
+     user, and only the 'make install' phase executed with root
      privileges.
 
-  5. Optionally, type `make installcheck' to repeat any self-tests, but
+  5. Optionally, type 'make installcheck' to repeat any self-tests, but
      this time using the binaries in their final installed location.
      This target does not install anything.  Running this target as a
-     regular user, particularly if the prior `make install' required
+     regular user, particularly if the prior 'make install' required
      root privileges, verifies that the installation completed
      correctly.
 
   6. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
+     source code directory by typing 'make clean'.  To also remove the
+     files that 'configure' created (so you can compile the package for
+     a different kind of computer), type 'make distclean'.  There is
+     also a 'make maintainer-clean' target, but that is intended mainly
      for the package's developers.  If you use it, you may have to get
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
-  7. Often, you can also type `make uninstall' to remove the installed
+  7. Often, you can also type 'make uninstall' to remove the installed
      files again.  In practice, not all packages have tested that
      uninstallation works correctly, even though it is required by the
      GNU Coding Standards.
 
-  8. Some packages, particularly those that use Automake, provide `make
+  8. Some packages, particularly those that use Automake, provide 'make
      distcheck', which can by used by developers to test that all other
-     targets like `make install' and `make uninstall' work correctly.
+     targets like 'make install' and 'make uninstall' work correctly.
      This target is generally not run by end users.
 
 Compilers and Options
 =====================
 
    Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  Run `./configure --help'
+the 'configure' script does not know about.  Run './configure --help'
 for details on some of the pertinent environment variables.
 
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
+   You can give 'configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here is
+an example:
 
      ./configure CC=c99 CFLAGS=-g LIBS=-lposix
 
@@ -113,21 +112,21 @@ Compiling For Multiple Architectures
 
    You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU `make'.  `cd' to the
+own directory.  To do this, you can use GNU 'make'.  'cd' to the
 directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.  This
-is known as a "VPATH" build.
+the 'configure' script.  'configure' automatically checks for the source
+code in the directory that 'configure' is in and in '..'.  This is known
+as a "VPATH" build.
 
-   With a non-GNU `make', it is safer to compile the package for one
+   With a non-GNU 'make', it is safer to compile the package for one
 architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use `make distclean' before
+installed the package for one architecture, use 'make distclean' before
 reconfiguring for another architecture.
 
    On MacOS X 10.5 and later systems, you can create libraries and
 executables that work on multiple system types--known as "fat" or
-"universal" binaries--by specifying multiple `-arch' options to the
-compiler but only a single `-arch' option to the preprocessor.  Like
+"universal" binaries--by specifying multiple '-arch' options to the
+compiler but only a single '-arch' option to the preprocessor.  Like
 this:
 
      ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
@@ -136,105 +135,104 @@ this:
 
    This is not guaranteed to produce working output in all cases, you
 may have to build one architecture at a time and combine the results
-using the `lipo' tool if you have problems.
+using the 'lipo' tool if you have problems.
 
 Installation Names
 ==================
 
-   By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX', where PREFIX must be an
+   By default, 'make install' installs the package's commands under
+'/usr/local/bin', include files under '/usr/local/include', etc.  You
+can specify an installation prefix other than '/usr/local' by giving
+'configure' the option '--prefix=PREFIX', where PREFIX must be an
 absolute file name.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+pass the option '--exec-prefix=PREFIX' to 'configure', the package uses
 PREFIX as the prefix for installing programs and libraries.
 Documentation and other data files still use the regular prefix.
 
    In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.  In general, the
-default for these options is expressed in terms of `${prefix}', so that
-specifying just `--prefix' will affect all of the other directory
+options like '--bindir=DIR' to specify different values for particular
+kinds of files.  Run 'configure --help' for a list of the directories
+you can set and what kinds of files go in them.  In general, the default
+for these options is expressed in terms of '${prefix}', so that
+specifying just '--prefix' will affect all of the other directory
 specifications that were not explicitly provided.
 
    The most portable way to affect installation locations is to pass the
-correct locations to `configure'; however, many packages provide one or
+correct locations to 'configure'; however, many packages provide one or
 both of the following shortcuts of passing variable assignments to the
-`make install' command line to change installation locations without
+'make install' command line to change installation locations without
 having to reconfigure or recompile.
 
    The first method involves providing an override variable for each
-affected directory.  For example, `make install
+affected directory.  For example, 'make install
 prefix=/alternate/directory' will choose an alternate location for all
 directory configuration variables that were expressed in terms of
-`${prefix}'.  Any directories that were specified during `configure',
-but not in terms of `${prefix}', must each be overridden at install
-time for the entire installation to be relocated.  The approach of
-makefile variable overrides for each directory variable is required by
-the GNU Coding Standards, and ideally causes no recompilation.
-However, some platforms have known limitations with the semantics of
-shared libraries that end up requiring recompilation when using this
-method, particularly noticeable in packages that use GNU Libtool.
-
-   The second method involves providing the `DESTDIR' variable.  For
-example, `make install DESTDIR=/alternate/directory' will prepend
-`/alternate/directory' before all installation names.  The approach of
-`DESTDIR' overrides is not required by the GNU Coding Standards, and
+'${prefix}'.  Any directories that were specified during 'configure',
+but not in terms of '${prefix}', must each be overridden at install time
+for the entire installation to be relocated.  The approach of makefile
+variable overrides for each directory variable is required by the GNU
+Coding Standards, and ideally causes no recompilation.  However, some
+platforms have known limitations with the semantics of shared libraries
+that end up requiring recompilation when using this method, particularly
+noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the 'DESTDIR' variable.  For
+example, 'make install DESTDIR=/alternate/directory' will prepend
+'/alternate/directory' before all installation names.  The approach of
+'DESTDIR' overrides is not required by the GNU Coding Standards, and
 does not work on platforms that have drive letters.  On the other hand,
 it does better at avoiding recompilation issues, and works well even
-when some directory options were not specified in terms of `${prefix}'
-at `configure' time.
+when some directory options were not specified in terms of '${prefix}'
+at 'configure' time.
 
 Optional Features
 =================
 
    If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
+with an extra prefix or suffix on their names by giving 'configure' the
+option '--program-prefix=PREFIX' or '--program-suffix=SUFFIX'.
+
+   Some packages pay attention to '--enable-FEATURE' options to
+'configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to '--with-PACKAGE' options, where PACKAGE
+is something like 'gnu-as' or 'x' (for the X Window System).  The
+'README' should mention any '--enable-' and '--with-' options that the
 package recognizes.
 
-   For packages that use the X Window System, `configure' can usually
+   For packages that use the X Window System, 'configure' can usually
 find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
+you can use the 'configure' options '--x-includes=DIR' and
+'--x-libraries=DIR' to specify their locations.
 
    Some packages offer the ability to configure how verbose the
-execution of `make' will be.  For these packages, running `./configure
+execution of 'make' will be.  For these packages, running './configure
 --enable-silent-rules' sets the default to minimal output, which can be
-overridden with `make V=1'; while running `./configure
+overridden with 'make V=1'; while running './configure
 --disable-silent-rules' sets the default to verbose, which can be
-overridden with `make V=0'.
+overridden with 'make V=0'.
 
 Particular systems
 ==================
 
-   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
-CC is not installed, it is recommended to use the following options in
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU CC
+is not installed, it is recommended to use the following options in
 order to use an ANSI C compiler:
 
      ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
-   HP-UX `make' updates targets which have the same time stamps as
-their prerequisites, which makes it generally unusable when shipped
-generated files such as `configure' are involved.  Use GNU `make'
-instead.
+   HP-UX 'make' updates targets which have the same time stamps as their
+prerequisites, which makes it generally unusable when shipped generated
+files such as 'configure' are involved.  Use GNU 'make' instead.
 
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
-a workaround.  If GNU CC is not installed, it is therefore recommended
-to try
+parse its '<wchar.h>' header file.  The option '-nodtk' can be used as a
+workaround.  If GNU CC is not installed, it is therefore recommended to
+try
 
      ./configure CC="cc"
 
@@ -242,26 +240,26 @@ and if that doesn't work, try
 
      ./configure CC="cc -nodtk"
 
-   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+   On Solaris, don't put '/usr/ucb' early in your 'PATH'.  This
 directory contains several dysfunctional programs; working variants of
-these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
-in your `PATH', put it _after_ `/usr/bin'.
+these programs are available in '/usr/bin'.  So, if you need '/usr/ucb'
+in your 'PATH', put it _after_ '/usr/bin'.
 
-   On Haiku, software installed for all users goes in `/boot/common',
-not `/usr/local'.  It is recommended to use the following options:
+   On Haiku, software installed for all users goes in '/boot/common',
+not '/usr/local'.  It is recommended to use the following options:
 
      ./configure --prefix=/boot/common
 
 Specifying the System Type
 ==========================
 
-   There may be some features `configure' cannot figure out
+   There may be some features 'configure' cannot figure out
 automatically, but needs to determine by the type of machine the package
 will run on.  Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
+_same_ architectures, 'configure' can figure that out, but if it prints
 a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
+'--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as 'sun4', or a canonical name which has the form:
 
      CPU-COMPANY-SYSTEM
 
@@ -270,101 +268,101 @@ where SYSTEM can have one of these forms:
      OS
      KERNEL-OS
 
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
+   See the file 'config.sub' for the possible values of each field.  If
+'config.sub' isn't included in this package, then this package doesn't
 need to know the machine type.
 
    If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
+use the option '--target=TYPE' to select the type of system they will
 produce code for.
 
    If you want to _use_ a cross compiler, that generates code for a
 platform different from the build platform, you should specify the
 "host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
+eventually be run) with '--host=TYPE'.
 
 Sharing Defaults
 ================
 
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
+   If you want to set default values for 'configure' scripts to share,
+you can create a site shell script called 'config.site' that gives
+default values for variables like 'CC', 'cache_file', and 'prefix'.
+'configure' looks for 'PREFIX/share/config.site' if it exists, then
+'PREFIX/etc/config.site' if it exists.  Or, you can set the
+'CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all 'configure' scripts look for a site script.
 
 Defining Variables
 ==================
 
    Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
+environment passed to 'configure'.  However, some packages may run
 configure again during the build, and the customized values of these
 variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
+them in the 'configure' command line, using 'VAR=value'.  For example:
 
      ./configure CC=/usr/local2/bin/gcc
 
-causes the specified `gcc' to be used as the C compiler (unless it is
+causes the specified 'gcc' to be used as the C compiler (unless it is
 overridden in the site shell script).
 
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf limitation.  Until the limitation is lifted, you can use
-this workaround:
+Unfortunately, this technique does not work for 'CONFIG_SHELL' due to an
+Autoconf limitation.  Until the limitation is lifted, you can use this
+workaround:
 
      CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
 
-`configure' Invocation
+'configure' Invocation
 ======================
 
-   `configure' recognizes the following options to control how it
+   'configure' recognizes the following options to control how it
 operates.
 
-`--help'
-`-h'
-     Print a summary of all of the options to `configure', and exit.
+'--help'
+'-h'
+     Print a summary of all of the options to 'configure', and exit.
 
-`--help=short'
-`--help=recursive'
+'--help=short'
+'--help=recursive'
      Print a summary of the options unique to this package's
-     `configure', and exit.  The `short' variant lists options used
-     only in the top level, while the `recursive' variant lists options
-     also present in any nested packages.
+     'configure', and exit.  The 'short' variant lists options used only
+     in the top level, while the 'recursive' variant lists options also
+     present in any nested packages.
 
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
+'--version'
+'-V'
+     Print the version of Autoconf used to generate the 'configure'
      script, and exit.
 
-`--cache-file=FILE'
+'--cache-file=FILE'
      Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     traditionally 'config.cache'.  FILE defaults to '/dev/null' to
      disable caching.
 
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
+'--config-cache'
+'-C'
+     Alias for '--cache-file=config.cache'.
 
-`--quiet'
-`--silent'
-`-q'
+'--quiet'
+'--silent'
+'-q'
      Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
+     suppress all normal output, redirect it to '/dev/null' (any error
      messages will still be shown).
 
-`--srcdir=DIR'
+'--srcdir=DIR'
      Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
+     'configure' can determine that directory automatically.
 
-`--prefix=DIR'
-     Use DIR as the installation prefix.  *note Installation Names::
-     for more details, including other options available for fine-tuning
-     the installation locations.
+'--prefix=DIR'
+     Use DIR as the installation prefix.  *note Installation Names:: for
+     more details, including other options available for fine-tuning the
+     installation locations.
 
-`--no-create'
-`-n'
+'--no-create'
+'-n'
      Run the configure checks, but stop before creating any output
      files.
 
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
+'configure' also accepts some other, not widely useful, options.  Run
+'configure --help' for more details.
diff --git a/data/apt_check.py b/data/apt_check.py
index edb0f71..28026a4 100755
--- a/data/apt_check.py
+++ b/data/apt_check.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 
 
-#nice apt-get -s -o Debug::NoLocking=true upgrade | grep ^Inst 
+# nice apt-get -s -o Debug::NoLocking=true upgrade | grep ^Inst
 
 import apt
 import apt_pkg
@@ -24,15 +24,15 @@ def _(msg):
 
 
 def _handleException(type, value, tb):
-    sys.stderr.write("E: "+ _("Unknown Error: '%s' (%s)") % (type,value))
+    sys.stderr.write("E: " + _("Unknown Error: '%s' (%s)") % (type, value))
     sys.exit(-1)
 
 
 def clean(cache, depcache):
     " unmark (clean) all changes from the given depcache "
     # mvo: looping is too inefficient with the new auto-mark code
-    #for pkg in cache.Packages:
-    #    depcache.MarkKeep(pkg)
+    # for pkg in cache.Packages:
+    #     depcache.MarkKeep(pkg)
     depcache.init()
 
 
@@ -68,8 +68,8 @@ def isESMUpgrade(ver):
 
 def write_package_names(outstream, cache, depcache):
     " write out package names that change to outstream "
-    pkgs = [pkg for pkg in cache.packages if depcache.marked_install(pkg) or
-        depcache.marked_upgrade(pkg)]
+    pkgs = [pkg for pkg in cache.packages if depcache.marked_install(pkg)
+            or depcache.marked_upgrade(pkg)]
     outstream.write("\n".join([p.name for p in pkgs]))
 
 
@@ -79,28 +79,29 @@ def write_human_readable_summary(outstream, upgrades, security_updates,
     if have_esm is not None:
         if have_esm:
             outstream.write(gettext.dgettext("update-notifier",
-                                             "UA Infrastructure Extended "
+                                             "UA Infra: Extended "
                                              "Security Maintenance (ESM) is "
                                              "enabled."))
         else:
             outstream.write(gettext.dgettext("update-notifier",
-                                             "UA Infrastructure Extended "
+                                             "UA Infra: Extended "
                                              "Security Maintenance (ESM) is "
                                              "not enabled."))
         outstream.write("\n\n")
 
     outstream.write(gettext.dngettext("update-notifier",
-                            "%i package can be updated.",
-                            "%i packages can be updated.",
-                            upgrades) % upgrades)
+                                      "%i package can be updated.",
+                                      "%i packages can be updated.",
+                                      upgrades) %
+                    upgrades)
     outstream.write("\n")
     if esm_updates > 0:
         outstream.write(gettext.dngettext("update-notifier",
-                                          "%i of these updates is provided "
-                                          "through UA Infrastructure ESM.",
+                                          "%i of these updates is fixed "
+                                          "through UA Infra: ESM.",
                                           "%i of these updates are "
-                                          "provided through UA "
-                                          "Infrastructure ESM.",
+                                          "fixed through UA "
+                                          "Infra: ESM.",
                                           esm_updates) %
                         esm_updates)
         outstream.write("\n")
@@ -121,10 +122,10 @@ def write_human_readable_summary(outstream, upgrades, security_updates,
         if disabled_esm_updates > 0:
             outstream.write("\n")
             outstream.write(gettext.dngettext("update-notifier",
-                                              "Enable UA Infrastructure ESM "
+                                              "Enable UA Infra: ESM "
                                               "to receive %i additional "
                                               "security update.",
-                                              "Enable UA Infrastructure ESM "
+                                              "Enable UA Infra: ESM "
                                               "to receive %i additional "
                                               "security updates.",
                                               disabled_esm_updates) %
@@ -132,12 +133,12 @@ def write_human_readable_summary(outstream, upgrades, security_updates,
         else:
             outstream.write("\n")
             outstream.write(gettext.dgettext("update-notifier",
-                                             "Enable UA Infrastructure ESM to "
+                                             "Enable UA Infra: ESM to "
                                              "receive additional future "
                                              "security updates."))
         outstream.write("\n")
         outstream.write(gettext.dgettext("update-notifier",
-                                         "See https://ubuntu.com/esm "
+                                         "See https://ubuntu.com/security/esm "
                                          "or run: sudo ua status"))
     outstream.write("\n")
 
@@ -165,20 +166,21 @@ def init():
     os.nice(19)
     apt_pkg.init()
 
+
 def run(options=None):
 
     # we are run in "are security updates installed automatically?"
     # question mode
     if options.security_updates_unattended:
         res = apt_pkg.config.find_i("APT::Periodic::Unattended-Upgrade", 0)
-        #print(res)
+        # print(res)
         sys.exit(res)
 
     # get caches
     try:
         cache = apt_pkg.Cache(apt.progress.base.OpProgress())
     except SystemError as e:
-        sys.stderr.write("E: "+ _("Error: Opening the cache (%s)") % e)
+        sys.stderr.write("E: " + _("Error: Opening the cache (%s)") % e)
         sys.exit(-1)
     depcache = apt_pkg.DepCache(cache)
 
@@ -188,14 +190,14 @@ def run(options=None):
         depcache.init()
 
     if depcache.broken_count > 0:
-        sys.stderr.write("E: "+ _("Error: BrokenCount > 0"))
+        sys.stderr.write("E: " + _("Error: BrokenCount > 0"))
         sys.exit(-1)
 
     # do the upgrade (not dist-upgrade!)
     try:
-        saveDistUpgrade(cache,depcache)
+        saveDistUpgrade(cache, depcache)
     except SystemError as e:
-        sys.stderr.write("E: "+ _("Error: Marking the upgrade (%s)") % e)
+        sys.stderr.write("E: " + _("Error: Marking the upgrade (%s)") % e)
         sys.exit(-1)
 
     # Check if we have ESM enabled or disabled; and if it exists in the
@@ -227,7 +229,8 @@ def run(options=None):
                 disabled_esm_updates += 1
 
             # skip packages that are not marked upgraded/installed
-            if not (depcache.marked_install(pkg) or depcache.marked_upgrade(pkg)):
+            if not (depcache.marked_install(pkg)
+                    or depcache.marked_upgrade(pkg)):
                 continue
             # check if this is really a upgrade or a false positive
             # (workaround for ubuntu #7907)
@@ -247,7 +250,8 @@ def run(options=None):
             try:
                 from UpdateManager.Core.UpdateList import UpdateList
                 ul = UpdateList(None)
-                ignored = ul._is_ignored_phased_update(aptcache[pkg.get_fullname()])
+                ignored = ul._is_ignored_phased_update(
+                    aptcache[pkg.get_fullname()])
                 if ignored:
                     depcache.mark_keep(pkg)
                     continue
@@ -259,8 +263,9 @@ def run(options=None):
             # now check for security updates that are masked by a
             # candidate version from another repo (-proposed or -updates)
             for ver in pkg.version_list:
-                if (inst_ver and apt_pkg.version_compare(ver.ver_str, inst_ver.ver_str) <= 0):
-                    #print("skipping '%s' " % ver.VerStr)
+                if (inst_ver
+                        and apt_pkg.version_compare(ver.ver_str,
+                                                    inst_ver.ver_str) <= 0):
                     continue
                 if isESMUpgrade(ver):
                     esm_updates += 1
@@ -290,8 +295,8 @@ if __name__ == "__main__":
     sys.excepthook = _handleException
 
     # gettext
-    APP="update-notifier"
-    DIR="/usr/share/locale"
+    APP = "update-notifier"
+    DIR = "/usr/share/locale"
     gettext.bindtextdomain(APP, DIR)
     gettext.textdomain(APP)
 
@@ -301,7 +306,8 @@ if __name__ == "__main__":
                       "--package-names",
                       action="store_true",
                       dest="show_package_names",
-                      help=_("Show the packages that are going to be installed/upgraded"))
+                      help=_("Show the packages that are "
+                             "going to be installed/upgraded"))
     parser.add_option("",
                       "--human-readable",
                       action="store_true",
diff --git a/data/backend_helper.py b/data/backend_helper.py
index 83d9f38..a67244d 100755
--- a/data/backend_helper.py
+++ b/data/backend_helper.py
@@ -1,7 +1,6 @@
 #!/usr/bin/python3
 
 import argparse
-import dbus
 import logging
 import os
 import subprocess
@@ -10,7 +9,7 @@ import sys
 HAVE_APTDAEMON = False
 try:
     import aptdaemon.gtk3widgets
-    HAVE_APTDAEMON=True
+    HAVE_APTDAEMON = True
 except ImportError:
     pass
 
@@ -36,13 +35,14 @@ def _install_all_updates_aptdaemon():
     Gtk.main()
     return trans.exit == enums.EXIT_SUCCESS
 
+
 def _install_all_updates_synaptic():
-    cmd = [ "/usr/bin/synaptic-pkexec",
-            "--dist-upgrade-mode",
-            "--non-interactive",
-            "--hide-main-window",
-            "-o", "Synaptic::AskRelated=true",
-            ]
+    cmd = ["/usr/bin/synaptic-pkexec",
+           "--dist-upgrade-mode",
+           "--non-interactive",
+           "--hide-main-window",
+           "-o", "Synaptic::AskRelated=true",
+           ]
     return subprocess.call(cmd)
 
 
@@ -99,6 +99,7 @@ def start_packagemanager():
 # add cdrom
 def _add_cdrom_sp(mount_path):
     from gi.repository import Gtk
+    import dbus
     import dbus.mainloop.glib
     bus = dbus.SystemBus(mainloop=dbus.mainloop.glib.DBusGMainLoop())
     proxy = bus.get_object("com.ubuntu.SoftwareProperties", "/")
@@ -123,9 +124,6 @@ def add_cdrom(mount_path):
         _add_cdrom_synaptic(mount_path)
     else:
         _add_cdrom_sp(mount_path)
-        
-
-
 
 
 if __name__ == "__main__":
diff --git a/data/hooks.py b/data/hooks.py
index d394d19..034852c 100755
--- a/data/hooks.py
+++ b/data/hooks.py
@@ -23,7 +23,7 @@ class HookFiles(object):
 
         def __init__(self, filename):
             self.filename = filename
-            self.mtime = os.stat(HookFiles.hookDir+filename).st_mtime
+            self.mtime = os.stat(HookFiles.hookDir + filename).st_mtime
             self.cmd_run = False
             self.seen = False
 
@@ -50,7 +50,8 @@ class HookFiles(object):
         """ read the users config file that stores what hook files are
             already seen
         """
-        data_home = os.getenv("XDG_CONFIG_HOME", os.path.join(user.home, '.config'))
+        data_home = os.getenv("XDG_CONFIG_HOME",
+                              os.path.join(user.home, '.config'))
         hooks_seen = os.path.join(data_home, 'update-notifier', 'hooks_seen')
         if os.path.exists(hooks_seen):
             for line in open(hooks_seen):
@@ -74,7 +75,7 @@ class HookFiles(object):
                 # we last saw it
                 h = self._hooks[hook]
                 if os.stat(self.hookDir + hook).st_mtime > int(h.mtime):
-                        h.seen = False
+                    h.seen = False
             else:
                 self._hooks[hook] = self.HookFile(hook)
 
@@ -114,7 +115,5 @@ if __name__ == "__main__":
 
     if options.check:
         sys.exit(check())
-    elif options.run:
-        run()
     elif options.test:
         test()
diff --git a/data/package-data-downloader b/data/package-data-downloader
index 703ef7f..23e1f79 100755
--- a/data/package-data-downloader
+++ b/data/package-data-downloader
@@ -160,8 +160,8 @@ def get_hook_file_names():
     res = []
     for relfile in os.listdir(DATADIR):
         # ignore files ending in .dpkg-*
-        if (os.path.splitext(relfile)[1] and
-                os.path.splitext(relfile)[1].startswith(".dpkg")):
+        if (os.path.splitext(relfile)[1]
+                and os.path.splitext(relfile)[1].startswith(".dpkg")):
             continue
         res.append(relfile)
     return res
@@ -247,7 +247,7 @@ def process_download_requests():
                         if should == "false":
                             # Do nothing with this file.
                             break
-                    except:
+                    except Exception:
                         pass
                     finally:
                         db.shutdown()
diff --git a/debian/changelog b/debian/changelog
index d2f9300..bfafa26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+update-notifier (3.168.12) xenial; urgency=medium
+
+  * data/apt_check.py: Update UA Infra: ESM product name and doc url
+    (LP: #1901627)
+    - data/apt_check.py: Update name and URL
+    - tests/test_motd.py: adapt unittests to match new behavior
+    - po/*.po: translation files with intltool-update -r
+  * Fix pep8 autopkgtest failures (LP: #1906436)
+    - d/control: add expilicit pep8 build-requires dependency
+    - data/apt_check.py: fix over-indent pep8 errors
+    - data/apt_check & data/backend_helper: resolve underindent pep8 issues
+      backport of 9e0f7ee50 [ Brian Murray ]
+    - data/apt_check.py, data/package-data-downloader, tests/test_pep8.py:
+      + update the code formating to be not hit W504 warnings,
+        change to ignore W503 and be consistent with update-manager.
+        [ Andrea Azzarone ]
+    - INSTALL, data/hooks.py, tests/test_package-data-downloader.py:
+      Fix E117 over-indented pep issues. [ Gianfranco Costamagna ]
+
+ -- Chad Smith <[e-mail]>  Mon, 30 Nov 2020 15:34:10 -0700
+
 update-notifier (3.168.11) xenial; urgency=medium
 
   [ Julian Andres Klode ]
diff --git a/debian/control b/debian/control
index a3b383a..5ef0578 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Build-Depends: debhelper (>= 7.0.50~),
                libx11-dev,
                autotools-dev,
                libappindicator3-dev,
+               pep8,
                po-debconf,
                python3,
                python3-apt,
diff --git a/po/ace.po b/po/ace.po
index 95e68aa..12fae45 100644
--- a/po/ace.po
+++ b/po/ace.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: update-notifier\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-10 12:15+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-11-19 05:31+0000\n"
 "PO-Revision-Date: 2009-06-02 16:12+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Achinese <[e-mail]>\n"
+"Language: ace\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,93 +24,121 @@ msgstr ""
 msgid "Unknown Error: '%s' (%s)"
 msgstr ""
 
-#: ../data/apt_check.py:66
+#: ../data/apt_check.py:82
+msgid "UA Infra: Extended Security Maintenance (ESM) is enabled."
+msgstr ""
+
+#: ../data/apt_check.py:87
+msgid "UA Infra: Extended Security Maintenance (ESM) is not enabled."
+msgstr ""
+
+#: ../data/apt_check.py:93
 #, python-format
 msgid "%i package can be updated."
 msgid_plural "%i packages can be updated."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../data/apt_check.py:71
+#: ../data/apt_check.py:99
+#, python-format
+msgid "%i of these updates is fixed through UA Infra: ESM."
+msgid_plural "%i of these updates are fixed through UA Infra: ESM."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../data/apt_check.py:108
 #, python-format
-msgid "%i update is a security update."
-msgid_plural "%i updates are security updates."
+msgid "%i of these updates is a security update."
+msgid_plural "%i of these updates are security updates."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../data/apt_check.py:97
+#: ../data/apt_check.py:117
+msgid "To see these additional updates run: apt list --upgradable"
+msgstr ""
+
+#: ../data/apt_check.py:124
+#, python-format
+msgid "Enable UA Infra: ESM to receive %i additional security update."
+msgid_plural "Enable UA Infra: ESM to receive %i additional security updates."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../data/apt_check.py:135
+msgid "Enable UA Infra: ESM to receive additional future security updates."
+msgstr ""
+
+#: ../data/apt_check.py:140
+msgid "See https://ubuntu.com/security/esm or run: sudo ua status"
+msgstr ""
+
+#: ../data/apt_check.py:181
 #, python-format
 msgid "Error: Opening the cache (%s)"
 msgstr ""
 
-#: ../data/apt_check.py:111
+#: ../data/apt_check.py:191
 msgid "Error: BrokenCount > 0"
 msgstr ""
 
-#: ../data/apt_check.py:118
+#: ../data/apt_check.py:198
 #, python-format
 msgid "Error: Marking the upgrade (%s)"
 msgstr ""
 
-#: ../data/apt_check.py:182
+#: ../data/apt_check.py:304
 msgid "Show the packages that are going to be installed/upgraded"
 msgstr ""
 
-#: ../data/apt_check.py:187
+#: ../data/apt_check.py:309
 msgid "Show human readable output on stdout"
 msgstr ""
 
-#: ../data/apt_check.py:191
+#: ../data/apt_check.py:313
 msgid ""
 "Return the time in days when security updates are installed unattended (0 "
 "means disabled)"
 msgstr ""
 
-#: ../src/crash.c:45
+#: ../src/crash.c:46
 msgid "System program problem detected"
 msgstr ""
 
-#: ../src/crash.c:46
+#: ../src/crash.c:47
 msgid "Do you want to report the problem now?"
 msgstr ""
 
-#: ../src/crash.c:56
+#: ../src/crash.c:57
 msgid "Report problem…"
 msgstr ""
 
-#: ../src/crash.c:72
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Please enter your password to access "
-"problem reports of system programs</span>"
-msgstr ""
-
-#: ../src/crash.c:92 ../src/crash.c:218
+#: ../src/crash.c:95 ../src/crash.c:185
 msgid "Crash report detected"
 msgstr ""
 
-#: ../src/crash.c:93
+#: ../src/crash.c:96
 msgid ""
 "An application has crashed on your system (now or in the past). Click on the "
 "notification icon to display details. "
 msgstr ""
 
 #. Create and show the notification
-#: ../src/avahi.c:15
+#: ../src/avahi.c:16
 msgid "Network service discovery disabled"
 msgstr ""
 
-#: ../src/avahi.c:16
+#: ../src/avahi.c:17
 msgid ""
 "Your current network has a .local domain, which is not recommended and "
 "incompatible with the Avahi network service discovery. The service has been "
 "disabled."
 msgstr ""
 
-#: ../src/gdu.c:53
+#: ../src/cdroms.c:48
 msgid "Software Packages Volume Detected"
 msgstr ""
 
-#: ../src/gdu.c:54
+#: ../src/cdroms.c:49
 msgid ""
 "<span weight=\"bold\" size=\"larger\">A volume with software packages has "
 "been detected.</span>\n"
@@ -117,15 +146,15 @@ msgid ""
 "Would you like to open it with the package manager?"
 msgstr ""
 
-#: ../src/gdu.c:62
+#: ../src/cdroms.c:57
 msgid "Start Package Manager"
 msgstr ""
 
-#: ../src/gdu.c:68
+#: ../src/cdroms.c:63
 msgid "Upgrade volume detected"
 msgstr ""
 
-#: ../src/gdu.c:69
+#: ../src/cdroms.c:64
 msgid ""
 "<span weight=\"bold\" size=\"larger\">A distribution volume with software "
 "packages has been detected.</span>\n"
@@ -133,35 +162,15 @@ msgid ""
 "Would you like to try to upgrade from it automatically? "
 msgstr ""
 
-#: ../src/gdu.c:76
+#: ../src/cdroms.c:71
 msgid "Run upgrade"
 msgstr ""
 
-#: ../src/gdu.c:82
-msgid "Addon volume detected"
-msgstr ""
-
-#: ../src/gdu.c:83
-msgid ""
-"<span weight=\"bold\" size=\"larger\">An addon volume with software "
-"applications has been detected.</span>\n"
-"\n"
-"Would you like to view/install the content? "
-msgstr ""
-
-#: ../src/gdu.c:90 ../src/gdu.c:109
-msgid "Start package manager"
-msgstr ""
-
-#: ../src/gdu.c:92
-msgid "Start addon installer"
-msgstr ""
-
-#: ../src/gdu.c:100
+#: ../src/cdroms.c:79
 msgid "APTonCD volume detected"
 msgstr ""
 
-#: ../src/gdu.c:101
+#: ../src/cdroms.c:80
 msgid ""
 "<span weight=\"bold\" size=\"larger\">A volume with unofficial software "
 "packages has been detected.</span>\n"
@@ -169,66 +178,51 @@ msgid ""
 "Would you like to open it with the package manager?"
 msgstr ""
 
-#: ../src/hooks.c:346 ../ui/hooks-dialog.ui.h:2
+#: ../src/cdroms.c:88 ../src/update.c:39
+msgid "Start package manager"
+msgstr ""
+
+#: ../src/hooks.c:362 ../ui/hooks-dialog.ui.h:2
 msgid "_Run this action now"
 msgstr ""
 
-#: ../src/hooks.c:418 ../src/hooks.c:545 ../src/hooks.c:875
+#: ../src/hooks.c:514 ../src/hooks.c:664
 msgid "Information available"
 msgstr ""
 
-#: ../src/hooks.c:546
+#: ../src/hooks.c:665
 msgid "Click on the notification icon to show the available information.\n"
 msgstr ""
 
-#: ../src/reboot.c:29 ../src/reboot.c:277
-msgid "System restart required"
-msgstr ""
-
-#: ../src/reboot.c:30
-msgid ""
-"To finish updating your system, please restart it.\n"
-"\n"
-"Click on the notification icon for details."
-msgstr ""
-
-#: ../src/reboot.c:104
-msgid "Reboot failed"
-msgstr ""
-
-#: ../src/reboot.c:105
-msgid "Failed to request reboot, please shutdown manually"
-msgstr ""
-
-#: ../src/update.c:27
+#: ../src/update.c:28
 msgid "Show updates"
 msgstr ""
 
-#: ../src/update.c:31
+#: ../src/update.c:32
 msgid "Install all updates"
 msgstr ""
 
-#: ../src/update.c:35
+#: ../src/update.c:36
 msgid "Check for updates"
 msgstr ""
 
-#: ../src/update.c:80
+#: ../src/update.c:83
 #, c-format
 msgid "There is %i update available"
 msgid_plural "There are %i updates available"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/update.c:149
+#: ../src/update.c:147
 msgid "Show notifications"
 msgstr ""
 
 #. and update the tooltip
-#: ../src/update.c:208
+#: ../src/update.c:203
 msgid "A package manager is working"
 msgstr ""
 
-#: ../src/update.c:240
+#: ../src/update.c:235
 #, c-format
 msgid ""
 "There is %i update available. Click on the notification icon to show the "
@@ -239,19 +233,19 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/update.c:251
+#: ../src/update.c:246
 msgid "Software updates available"
 msgstr ""
 
-#: ../src/update.c:287
+#: ../src/update.c:284
 msgid ""
 "The update information is outdated. This may be caused by network problems "
 "or by a repository that is no longer available. Please update manually by "
-"clicking on this icon and then selecting 'Check for updates' and check if "
-"some of the listed repositories fail."
+"selecting 'Show updates' from the indicator menu, and watching for any "
+"failing repositories."
 msgstr ""
 
-#: ../src/update.c:582
+#: ../src/update.c:574
 #, c-format
 msgid ""
 "An error occurred, please run Package Manager from the right-click menu or "
@@ -259,39 +253,34 @@ msgid ""
 "The error message was: '%s'. "
 msgstr ""
 
-#: ../src/update.c:589
+#: ../src/update.c:581
 msgid ""
 "An error occurred, please run Package Manager from the right-click menu or "
 "apt-get in a terminal to see what is wrong."
 msgstr ""
 
-#: ../src/update.c:593
-msgid ""
-"This usually means that your installed packages have unmet dependencies"
+#: ../src/update.c:585
+msgid "This usually means that your installed packages have unmet dependencies"
 msgstr ""
 
-#: ../src/update.c:606
+#: ../src/update.c:598
 msgid "A problem occurred when checking for the updates."
 msgstr ""
 
-#: ../src/update-notifier.c:402
-msgid "Internal error"
-msgstr ""
-
-#: ../src/update-notifier.c:570
+#: ../src/update-notifier.c:541
 msgid "- inform about updates"
 msgstr ""
 
-#: ../src/update-notifier.c:572
+#: ../src/update-notifier.c:543
 #, c-format
 msgid "Failed to init the UI: %s\n"
 msgstr ""
 
-#: ../src/update-notifier.c:573
+#: ../src/update-notifier.c:544
 msgid "unknown error"
 msgstr ""
 
-#: ../src/update-notifier.c:596
+#: ../src/update-notifier.c:569
 msgid "update-notifier"
 msgstr ""
 
@@ -299,34 +288,24 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">Update information</span>"
 msgstr ""
 
-#: ../ui/reboot-dialog.ui.h:1
-msgid "Restart Required"
-msgstr ""
-
-#: ../ui/reboot-dialog.ui.h:2
-msgid "Restart _Later"
+#: ../data/com.ubuntu.update-notifier.policy.in.h:1
+msgid "Authentication is needed to upgrade"
 msgstr ""
 
-#: ../ui/reboot-dialog.ui.h:4
-msgid "_Restart Now"
+#: ../data/com.ubuntu.update-notifier.policy.in.h:2
+msgid "Authentication is needed to query package system lock status"
 msgstr ""
 
-#: ../ui/reboot-dialog.ui.h:3
-msgid ""
-"The computer needs to restart to finish installing updates. Please save your "
-"work before continuing."
-msgstr ""
-
-#: ../data/update-notifier.desktop.in.h:2
+#: ../data/update-notifier.desktop.in.h:1
 msgid "Update Notifier"
 msgstr ""
 
-#: ../data/update-notifier.desktop.in.h:1
+#: ../data/update-notifier.desktop.in.h:2
 msgid "Check for available updates automatically"
 msgstr ""
 
 #. Name
-#: ../data/package-data-downloads-failed.in:1
+#: ../data/package-data-downloads-failed.in:2
 msgid "Failure to download extra data files"
 msgstr ""
 
@@ -352,7 +331,7 @@ msgid ""
 msgstr ""
 
 #. Name
-#: ../data/package-data-downloads-failed-permanently.in:1
+#: ../data/package-data-downloads-failed-permanently.in:2
 msgid "Data files for some packages could not be downloaded"
 msgstr ""
 
diff --git a/po/af.po b/po/af.po
index f70d0b5..7c95e04 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-notifier\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-10 12:15+0100\n"
+"POT-Creation-Date: 2020-11-19 05:31+0000\n"
 "PO-Revision-Date: 2012-09-06 08:22+0000\n"
 "Last-Translator: Dawid de Jager <[e-mail]>\n"
 "Language-Team: Afrikaans <[e-mail]>\n"
+"Language: af\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,43 +24,77 @@ msgstr ""
 msgid "Unknown Error: '%s' (%s)"
 msgstr "Onbekende fout: '%s' (%s)"
 
-#: ../data/apt_check.py:66
+#: ../data/apt_check.py:82
+msgid "UA Infra: Extended Security Maintenance (ESM) is enabled."
+msgstr ""
+
+#: ../data/apt_check.py:87
+msgid "UA Infra: Extended Security Maintenance (ESM) is not enabled."
+msgstr ""
+
+#: ../data/apt_check.py:93
 #, python-format
 msgid "%i package can be updated."
 msgid_plural "%i packages can be updated."
 msgstr[0] "Daar kan %i pakket opgedateer word"
 msgstr[1] "Daar kan %i pakkette opgedateer word"
 
-#: ../data/apt_check.py:71
+#: ../data/apt_check.py:99
 #, python-format
-msgid "%i update is a security update."
-msgid_plural "%i updates are security updates."
+msgid "%i of these updates is fixed through UA Infra: ESM."
+msgid_plural "%i of these updates are fixed through UA Infra: ESM."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../data/apt_check.py:108
+#, fuzzy, python-format
+msgid "%i of these updates is a security update."
+msgid_plural "%i of these updates are security updates."
 msgstr[0] "%i bywerking is 'n veiligheidsopdatering."
 msgstr[1] "%i bywerkings is veiligheidsopdaterings."
 
-#: ../data/apt_check.py:97
+#: ../data/apt_check.py:117
+msgid "To see these additional updates run: apt list --upgradable"
+msgstr ""
+
+#: ../data/apt_check.py:124
+#, python-format
+msgid "Enable UA Infra: ESM to receive %i additional security update."
+msgid_plural "Enable UA Infra: ESM to receive %i additional security updates."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../data/apt_check.py:135
+msgid "Enable UA Infra: ESM to receive additional future security updates."
+msgstr ""
+
+#: ../data/apt_check.py:140
+msgid "See https://ubuntu.com/security/esm or run: sudo ua status"
+msgstr ""
+
+#: ../data/apt_check.py:181
 #, python-format
 msgid "Error: Opening the cache (%s)"
 msgstr "Fout: oopmaak van kas (%s)"
 
-#: ../data/apt_check.py:111
+#: ../data/apt_check.py:191
 msgid "Error: BrokenCount > 0"
 msgstr "Fout: BrokenCount > 0"
 
-#: ../data/apt_check.py:118
+#: ../data/apt_check.py:198
 #, python-format
 msgid "Error: Marking the upgrade (%s)"
 msgstr "Fout: Merk van opgradering (%s)"
 
-#: ../data/apt_check.py:182
+#: ../data/apt_check.py:304
 msgid "Show the packages that are going to be installed/upgraded"
 msgstr "Wys die pakkette wat geïnstalleer of opgradeer gaan word"
 
-#: ../data/apt_check.py:187
+#: ../data/apt_check.py:309
 msgid "Show human readable output on stdout"
 msgstr "Vertoon gemaklik leesbare uitvoer op stdout"
 
-#: ../data/apt_check.py:191
+#: ../data/apt_check.py:313
 msgid ""
 "Return the time in days when security updates are installed unattended (0 "
 "means disabled)"
@@ -67,31 +102,23 @@ msgstr ""
 "Gee die tyd in dae wanneer veiligheidsopdaterings automaties geïnstalleer "
 "word (0 beteken afgeskakel)."
 
-#: ../src/crash.c:45
+#: ../src/crash.c:46
 msgid "System program problem detected"
 msgstr "Stelsel program probleem opgespoor"
 
-#: ../src/crash.c:46
+#: ../src/crash.c:47
 msgid "Do you want to report the problem now?"
 msgstr "Wil u nou die probleem rapporteer?"
 
-#: ../src/crash.c:56
+#: ../src/crash.c:57
 msgid "Report problem…"
 msgstr "Rapporteer probleem..."
 
-#: ../src/crash.c:72
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Please enter your password to access "
-"problem reports of system programs</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Verskaf asseblief u wagwoord om "
-"foutverslae van u stelselprogramme te kan bekom</span>"
-
-#: ../src/crash.c:92 ../src/crash.c:218
+#: ../src/crash.c:95 ../src/crash.c:185
 msgid "Crash report detected"
 msgstr "Foutrapport gevind"
 
-#: ../src/crash.c:93
+#: ../src/crash.c:96
 msgid ""
 "An application has crashed on your system (now or in the past). Click on the "
 "notification icon to display details. "
@@ -100,11 +127,11 @@ msgstr ""
 "kennisgewing-afbeelding om meer besonderhede te bekom. "
 
 #. Create and show the notification
-#: ../src/avahi.c:15
+#: ../src/avahi.c:16
 msgid "Network service discovery disabled"
 msgstr "Die ontdekking van netwerkdienste is afgeskakel"
 
-#: ../src/avahi.c:16
+#: ../src/avahi.c:17
 msgid ""
 "Your current network has a .local domain, which is not recommended and "
 "incompatible with the Avahi network service discovery. The service has been "
@@ -114,31 +141,31 @@ msgstr ""
 "bruikbaar met die Avahi-netwerkdiensdetektor nie. Die diens is daarom "
 "afgeskakel."
 
-#: ../src/gdu.c:53
+#: ../src/cdroms.c:48
 msgid "Software Packages Volume Detected"
 msgstr "Skyf met sagtewarepakkette gevind"
 
-#: ../src/gdu.c:54
+#: ../src/cdroms.c:49
 msgid ""
 "<span weight=\"bold\" size=\"larger\">A volume with software packages has "
 "been detected.</span>\n"
 "\n"
 "Would you like to open it with the package manager?"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">A skyf met sagtewarepakkette is "
-"gevind.</span>\n"
+"<span weight=\"bold\" size=\"larger\">A skyf met sagtewarepakkette is gevind."
+"</span>\n"
 "\n"
 "Wil u dit met die pakketbeheerder oopmaak?"
 
-#: ../src/gdu.c:62
+#: ../src/cdroms.c:57
 msgid "Start Package Manager"
 msgstr "Begin Pakketbeheer"
 
-#: ../src/gdu.c:68
+#: ../src/cdroms.c:63
 msgid "Upgrade volume detected"
 msgstr "Opgraderingsvolume gevindG"
 
-#: ../src/gdu.c:69
+#: ../src/cdroms.c:64
 msgid ""
 "<span weight=\"bold\" size=\"larger\">A distribution volume with software "
 "packages has been detected.</span>\n"
@@ -150,39 +177,15 @@ msgstr ""
 "\n"
 "Wil u dit gebruik vir 'n outomatiese opgradering? "
 
-#: ../src/gdu.c:76
+#: ../src/cdroms.c:71
 msgid "Run upgrade"
 msgstr "Voer opgradering uit"
 
-#: ../src/gdu.c:82
-msgid "Addon volume detected"
-msgstr "Aanvullende volume gevind"
-
-#: ../src/gdu.c:83
-msgid ""
-"<span weight=\"bold\" size=\"larger\">An addon volume with software "
-"applications has been detected.</span>\n"
-"\n"
-"Would you like to view/install the content? "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">'n Aanvullende skyf met sagteware is "
-"gevind.</span>\n"
-"\n"
-"Wil u die inhoud aanskou/installeer? "
-
-#: ../src/gdu.c:90 ../src/gdu.c:109
-msgid "Start package manager"
-msgstr "Begin Pakketbeheer"
-
-#: ../src/gdu.c:92
-msgid "Start addon installer"
-msgstr "Begin byvoegsel installeerder"
-
-#: ../src/gdu.c:100
+#: ../src/cdroms.c:79
 msgid "APTonCD volume detected"
 msgstr "APTopCD-volume gevind"
 
-#: ../src/gdu.c:101
+#: ../src/cdroms.c:80
 msgid ""
 "<span weight=\"bold\" size=\"larger\">A volume with unofficial software "
 "packages has been detected.</span>\n"
@@ -194,70 +197,52 @@ msgstr ""
 "\n"
 "Wil u dit met die pakketbeheerder oopmaak?"
 
-#: ../src/hooks.c:346 ../ui/hooks-dialog.ui.h:2
+#: ../src/cdroms.c:88 ../src/update.c:39
+msgid "Start package manager"
+msgstr "Begin Pakketbeheer"
+
+#: ../src/hooks.c:362 ../ui/hooks-dialog.ui.h:2
 msgid "_Run this action now"
 msgstr "Voe_r hierdie aksie nou uit"
 
-#: ../src/hooks.c:418 ../src/hooks.c:545 ../src/hooks.c:875
+#: ../src/hooks.c:514 ../src/hooks.c:664
 msgid "Information available"
 msgstr "Informasie is beskikbaar"
 
-#: ../src/hooks.c:546
+#: ../src/hooks.c:665
 msgid "Click on the notification icon to show the available information.\n"
 msgstr ""
 "Kliek op die aanduier-afbeelding om die beskikbare inligting te vertoon\n"
 
-#: ../src/reboot.c:29 ../src/reboot.c:277
-msgid "System restart required"
-msgstr "Die rekenaar moet herlaai word"
-
-#: ../src/reboot.c:30
-msgid ""
-"To finish updating your system, please restart it.\n"
-"\n"
-"Click on the notification icon for details."
-msgstr ""
-"Om bywerking van u stelsel te voltooi, herbegin dit.\n"
-"\n"
-"Klik op die kennisgewingsikoon vir besonderhede."
-
-#: ../src/reboot.c:104
-msgid "Reboot failed"
-msgstr "Herlaai het misluk"
-
-#: ../src/reboot.c:105
-msgid "Failed to request reboot, please shutdown manually"
-msgstr "Kon nie herlaai nie, skakel asseblief self die rekenaar af"
-
-#: ../src/update.c:27
+#: ../src/update.c:28
 msgid "Show updates"
 msgstr "Vertoon opdaterings"
 
-#: ../src/update.c:31
+#: ../src/update.c:32
 msgid "Install all updates"
 msgstr "Installeer alle opdaterings"
 
-#: ../src/update.c:35
+#: ../src/update.c:36
 msgid "Check for updates"
 msgstr "Kontrolleer vir opdaterings"
 
-#: ../src/update.c:80
+#: ../src/update.c:83
 #, c-format
 msgid "There is %i update available"
 msgid_plural "There are %i updates available"
 msgstr[0] "Daar is %i opdatering beskikbaar"
 msgstr[1] "Daar is %i opdaterings beskikbaar"
 
-#: ../src/update.c:149
+#: ../src/update.c:147
 msgid "Show notifications"
 msgstr "Wys kennisgewings"
 
 #. and update the tooltip
-#: ../src/update.c:208
+#: ../src/update.c:203
 msgid "A package manager is working"
 msgstr "Daar is reeds 'n pakketbeheerder doenig"
 
-#: ../src/update.c:240
+#: ../src/update.c:235
 #, c-format
 msgid ""
 "There is %i update available. Click on the notification icon to show the "
@@ -272,16 +257,17 @@ msgstr[1] ""
 "Daar is %i opdaterings beskikbaar. Kliek op die kennisgewing-afbeelding vir "
 "meer inligting."
 
-#: ../src/update.c:251
+#: ../src/update.c:246
 msgid "Software updates available"
 msgstr "Sagteware-opdaterings beskikbaar"
 
-#: ../src/update.c:287
+#: ../src/update.c:284
+#, fuzzy
 msgid ""
 "The update information is outdated. This may be caused by network problems "
 "or by a repository that is no longer available. Please update manually by "
-"clicking on this icon and then selecting 'Check for updates' and check if "
-"some of the listed repositories fail."
+"selecting 'Show updates' from the indicator menu, and watching for any "
+"failing repositories."
 msgstr ""
 "Die opdaterings-informasie is verouderd. Dit kan veroorsaak wees deur "
 "netwerkprobleme of deur 'n sagtewarebron dié nie meer beskikbaar nie. "
@@ -289,7 +275,7 @@ msgstr ""
 "te kies vir \"Kontroleer vir opdaterings\". Kontroleer ook of een van die "
 "getoonde sagtewarebronne nie werk nie."
 
-#: ../src/update.c:582
+#: ../src/update.c:574
 #, c-format
 msgid ""
 "An error occurred, please run Package Manager from the right-click menu or "
@@ -300,7 +286,7 @@ msgstr ""
 "klik kieslys of apt-get in 'n terminaal om te sien wat fout is.\n"
 "Die foutboodskap was: '%s'. "
 
-#: ../src/update.c:589
+#: ../src/update.c:581
 msgid ""
 "An error occurred, please run Package Manager from the right-click menu or "
 "apt-get in a terminal to see what is wrong."
@@ -308,35 +294,30 @@ msgstr ""
 "'n Fout het voorgekom. Voer die Pakketbeheerder vanuit die konteksmenu, of "
 "apt-get in 'n terminaalvenster om te sien wat verkeerd is."
 
-#: ../src/update.c:593
-msgid ""
-"This usually means that your installed packages have unmet dependencies"
+#: ../src/update.c:585
+msgid "This usually means that your installed packages have unmet dependencies"
 msgstr ""
 "Dit beteken gewoonlik dat enkele sagtewarepakette op u rekenaar afhanklik is "
 "van ander pakkette wat nog nie geïnstalleer is nie."
 
-#: ../src/update.c:606
+#: ../src/update.c:598
 msgid "A problem occurred when checking for the updates."
 msgstr "'n Probleem het ontstaan by die kontrolering van opdaterings"
 
-#: ../src/update-notifier.c:402
-msgid "Internal error"
-msgstr "Interne fout"
-
-#: ../src/update-notifier.c:570
+#: ../src/update-notifier.c:541
 msgid "- inform about updates"
 msgstr "-informeer oor opdaterings"
 
-#: ../src/update-notifier.c:572
+#: ../src/update-notifier.c:543
 #, c-format
 msgid "Failed to init the UI: %s\n"
 msgstr "Gebruikerskoppelvlak-inisialisering het misluk: %s\n"
 
-#: ../src/update-notifier.c:573
+#: ../src/update-notifier.c:544
 msgid "unknown error"
 msgstr "onbekende fout"
 
-#: ../src/update-notifier.c:596
+#: ../src/update-notifier.c:569
 msgid "update-notifier"
 msgstr "opdateringskennisgewing"
 
@@ -344,36 +325,24 @@ msgstr "opdateringskennisgewing"
 msgid "<span weight=\"bold\" size=\"larger\">Update information</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Opdateringsinformasie</span>"
 
-#: ../ui/reboot-dialog.ui.h:1
-msgid "Restart Required"
-msgstr "Herlaai benodig"
-
-#: ../ui/reboot-dialog.ui.h:2
-msgid "Restart _Later"
-msgstr "Herlaai _later"
-
-#: ../ui/reboot-dialog.ui.h:4
-msgid "_Restart Now"
-msgstr "He_rlaai nou"
+#: ../data/com.ubuntu.update-notifier.policy.in.h:1
+msgid "Authentication is needed to upgrade"
+msgstr ""
 
-#: ../ui/reboot-dialog.ui.h:3
-msgid ""
-"The computer needs to restart to finish installing updates. Please save your "
-"work before continuing."
+#: ../data/com.ubuntu.update-notifier.policy.in.h:2
+msgid "Authentication is needed to query package system lock status"
 msgstr ""
-"The rekenaar moet herlaai word voordat die installering voltooi kan word. "
-"Maak asseblief seker dat alle data gestoor is voor u verder gaan."
 
-#: ../data/update-notifier.desktop.in.h:2
+#: ../data/update-notifier.desktop.in.h:1
 msgid "Update Notifier"
 msgstr "Opdateringskennisgewing"
 
-#: ../data/update-notifier.desktop.in.h:1
+#: ../data/update-notifier.desktop.in.h:2
 msgid "Check for available updates automatically"
 msgstr "Kontroleer automaties vir nuwe opdaterings"
 
 #. Name
-#: ../data/package-data-downloads-failed.in:1
+#: ../data/package-data-downloads-failed.in:2
 msgid "Failure to download extra data files"
 msgstr "Aflaai van bykomende data lêers het misluk"
 
@@ -403,7 +372,7 @@ msgstr ""
 "Die hardloop van hierdie bevel vereis 'n internet verbinding."
 
 #. Name
-#: ../data/package-data-downloads-failed-permanently.in:1
+#: ../data/package-data-downloads-failed-permanently.in:2
 msgid "Data files for some packages could not be downloaded"
 msgstr "Data lêers vir sommige pakkette kon nie afgelaai word nie"
 
@@ -418,3 +387,64 @@ msgstr ""
 "toestand op u stelsel laat. U mag nodig hê om u internet verbinding reg te "
 "maak en dan die pakkette verwyder en weer installeer om die probleem reg te "
 "maak."
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Please enter your password to "
+#~ "access problem reports of system programs</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Verskaf asseblief u wagwoord om "
+#~ "foutverslae van u stelselprogramme te kan bekom</span>"
+
+#~ msgid "Addon volume detected"
+#~ msgstr "Aanvullende volume gevind"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">An addon volume with software "
+#~ "applications has been detected.</span>\n"
+#~ "\n"
+#~ "Would you like to view/install the content? "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">'n Aanvullende skyf met sagteware "
+#~ "is gevind.</span>\n"
+#~ "\n"
+#~ "Wil u die inhoud aanskou/installeer? "
+
+#~ msgid "Start addon installer"
+#~ msgstr "Begin byvoegsel installeerder"
+
+#~ msgid "System restart required"
+#~ msgstr "Die rekenaar moet herlaai word"
+
+#~ msgid ""
+#~ "To finish updating your system, please restart it.\n"
+#~ "\n"
+#~ "Click on the notification icon for details."
+#~ msgstr ""
+#~ "Om bywerking van u stelsel te voltooi, herbegin dit.\n"
+#~ "\n"
+#~ "Klik op die kennisgewingsikoon vir besonderhede."
+
+#~ msgid "Reboot failed"
+#~ msgstr "Herlaai het misluk"
+
+#~ msgid "Failed to request reboot, please shutdown manually"
+#~ msgstr "Kon nie herlaai nie, skakel asseblief self die rekenaar af"
+
+#~ msgid "Internal error"
+#~ msgstr "Interne fout"
+
+#~ msgid "Restart Required"
+#~ msgstr "Herlaai benodig"
+
+#~ msgid "Restart _Later"
+#~ msgstr "Herlaai _later"
+
+#~ msgid "_Restart Now"
+#~ msgstr "He_rlaai nou"
+
+#~ msgid ""
+#~ "The computer needs to restart to finish installing updates. Please save "
+#~ "your work before continuing."
+#~ msgstr ""
+#~ "The rekenaar moet herlaai word voordat die installering voltooi kan word. "
+#~ "Maak asseblief seker dat alle data gestoor is voor u verder gaan."
diff --git a/po/am.po b/po/am.po
index d207cc7..8ef4512 100644
--- a/po/am.po
+++ b/po/am.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: update-notifier\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-10 12:15+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-11-19 05:31+0000\n"
 "PO-Revision-Date: 2012-10-29 01:19+0000\n"
 "Last-Translator: samson <Unknown>\n"
 "Language-Team: Amharic <[e-mail]>\n"
+"Language: am\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,93 +24,121 @@ msgstr ""
 msgid "Unknown Error: '%s' (%s)"
 msgstr "ያልታወቀ ስህተት: '%s' (%s)"
 
-#: ../data/apt_check.py:66
+#: ../data/apt_check.py:82
+msgid "UA Infra: Extended Security Maintenance (ESM) is enabled."
+msgstr ""
+
+#: ../data/apt_check.py:87
+msgid "UA Infra: Extended Security Maintenance (ESM) is not enabled."
+msgstr ""
+
+#: ../data/apt_check.py:93
 #, python-format
 msgid "%i package can be updated."
 msgid_plural "%i packages can be updated."
 msgstr[0] "%i ጥቅሉን ማሻሻል ይቻላል"
 msgstr[1] "%i ጥቅሎቹን ማሻሻል ይቻላል"
 
-#: ../data/apt_check.py:71
+#: ../data/apt_check.py:99
 #, python-format
-msgid "%i update is a security update."
-msgid_plural "%i updates are security updates."
+msgid "%i of these updates is fixed through UA Infra: ESM."
+msgid_plural "%i of these updates are fixed through UA Infra: ESM."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../data/apt_check.py:108
+#, fuzzy, python-format
+msgid "%i of these updates is a security update."
+msgid_plural "%i of these updates are security updates."
 msgstr[0] "%i ማሻሻያው የደህንነት ማሻሻያ ነው"
 msgstr[1] "%i ማሻሻያዎቹ የደህንነት ማሻሻያዎች ናቸው"
 
-#: ../data/apt_check.py:97
+#: ../data/apt_check.py:117
+msgid "To see these additional updates run: apt list --upgradable"
+msgstr ""
+
+#: ../data/apt_check.py:124
+#, python-format
+msgid "Enable UA Infra: ESM to receive %i additional security update."
+msgid_plural "Enable UA Infra: ESM to receive %i additional security updates."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../data/apt_check.py:135
+msgid "Enable UA Infra: ESM to receive additional future security updates."
+msgstr ""
+
+#: ../data/apt_check.py:140
+msgid "See https://ubuntu.com/security/esm or run: sudo ua status"
+msgstr ""
+
+#: ../data/apt_check.py:181
 #, python-format
 msgid "Error: Opening the cache (%s)"
 msgstr "ስህተት: ካሽን (%s) በመክፈት ላይ"
 
-#: ../data/apt_check.py:111
+#: ../data/apt_check.py:191
 msgid "Error: BrokenCount > 0"
 msgstr "ስህተት: የተሰበሩትን በመቁጠር > 0"
 
-#: ../data/apt_check.py:118
+#: ../data/apt_check.py:198
 #, python-format
 msgid "Error: Marking the upgrade (%s)"
 msgstr "ስህተት ማሻሻያውን ምልክት  በማድረግ ላይ (%s)"
 
-#: ../data/apt_check.py:182
+#: ../data/apt_check.py:304
 msgid "Show the packages that are going to be installed/upgraded"
 msgstr "ማሳየት ጥቅሎችን የሚሻሻሉትን/የሚገጠሙትን"
 
-#: ../data/apt_check.py:187
+#: ../data/apt_check.py:309
 msgid "Show human readable output on stdout"
 msgstr ""
 
-#: ../data/apt_check.py:191
+#: ../data/apt_check.py:313
 msgid ""
 "Return the time in days when security updates are installed unattended (0 "
 "means disabled)"
 msgstr ""
 
-#: ../src/crash.c:45
+#: ../src/crash.c:46
 msgid "System program problem detected"
 msgstr "የስርአት ፕሮግራም ችግር ተገኝቷል"
 
-#: ../src/crash.c:46
+#: ../src/crash.c:47
 msgid "Do you want to report the problem now?"
 msgstr "ችግሩን አሁን ማሳወቅ ይፈልጋሉ?"
 
-#: ../src/crash.c:56
+#: ../src/crash.c:57
 msgid "Report problem…"
 msgstr "ችግሩን ማሳወቅ..."
 
-#: ../src/crash.c:72
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Please enter your password to access "
-"problem reports of system programs</span>"
-msgstr ""
-
-#: ../src/crash.c:92 ../src/crash.c:218
+#: ../src/crash.c:95 ../src/crash.c:185
 msgid "Crash report detected"
 msgstr "የመጋጨት መግለጫ ተገኝቷል"
 
-#: ../src/crash.c:93
+#: ../src/crash.c:96
 msgid ""
 "An application has crashed on your system (now or in the past). Click on the "
 "notification icon to display details. "
 msgstr ""
 
 #. Create and show the notification
-#: ../src/avahi.c:15
+#: ../src/avahi.c:16
 msgid "Network service discovery disabled"
 msgstr ""
 
-#: ../src/avahi.c:16
+#: ../src/avahi.c:17
 msgid ""
 "Your current network has a .local domain, which is not recommended and "
 "incompatible with the Avahi network service discovery. The service has been "
 "disabled."
 msgstr ""
 
-#: ../src/gdu.c:53
+#: ../src/cdroms.c:48
 msgid "Software Packages Volume Detected"
 msgstr "የሶፍትዌር ጥቅል መጠን ተገኝቷል"
 
-#: ../src/gdu.c:54
+#: ../src/cdroms.c:49
 msgid ""
 "<span weight=\"bold\" size=\"larger\">A volume with software packages has "
 "been detected.</span>\n"
@@ -117,15 +146,15 @@ msgid ""
 "Would you like to open it with the package manager?"
 msgstr ""
 
-#: ../src/gdu.c:62
+#: ../src/cdroms.c:57
 msgid "Start Package Manager"
 msgstr "የጥቅል አስተዳዳሪን መጀመር"
 
-#: ../src/gdu.c:68
+#: ../src/cdroms.c:63
 msgid "Upgrade volume detected"
 msgstr "የማሻሻያ መጠን ተገኝቷል"
 
-#: ../src/gdu.c:69
+#: ../src/cdroms.c:64
 msgid ""
 "<span weight=\"bold\" size=\"larger\">A distribution volume with software "
 "packages has been detected.</span>\n"
@@ -133,35 +162,15 @@ msgid ""
 "Would you like to try to upgrade from it automatically? "
 msgstr ""
 
-#: ../src/gdu.c:76
+#: ../src/cdroms.c:71
 msgid "Run upgrade"
 msgstr "ማሻሻያ ማስኬድ"
 
-#: ../src/gdu.c:82
-msgid "Addon volume detected"
-msgstr ""
-
-#: ../src/gdu.c:83
-msgid ""
-"<span weight=\"bold\" size=\"larger\">An addon volume with software "
-"applications has been detected.</span>\n"
-"\n"
-"Would you like to view/install the content? "
-msgstr ""
-
-#: ../src/gdu.c:90 ../src/gdu.c:109
-msgid "Start package manager"
-msgstr "ጥቅል አስተዳዳሪውን አስነሳ"
-
-#: ../src/gdu.c:92
-msgid "Start addon installer"
-msgstr ""
-
-#: ../src/gdu.c:100
+#: ../src/cdroms.c:79
 msgid "APTonCD volume detected"
 msgstr ""
 
-#: ../src/gdu.c:101
+#: ../src/cdroms.c:80
 msgid ""
 "<span weight=\"bold\" size=\"larger\">A volume with unofficial software "
 "packages has been detected.</span>\n"
@@ -169,66 +178,51 @@ msgid ""
 "Would you like to open it with the package manager?"
 msgstr ""
 
-#: ../src/hooks.c:346 ../ui/hooks-dialog.ui.h:2
+#: ../src/cdroms.c:88 ../src/update.c:39
+msgid "Start package manager"
+msgstr "ጥቅል አስተዳዳሪውን አስነሳ"
+
+#: ../src/hooks.c:362 ../ui/hooks-dialog.ui.h:2
 msgid "_Run this action now"
 msgstr "ይህን ተግባር _አስኪድ"
 
-#: ../src/hooks.c:418 ../src/hooks.c:545 ../src/hooks.c:875
+#: ../src/hooks.c:514 ../src/hooks.c:664
 msgid "Information available"
 msgstr "የተገኙ መረጃዎች"
 
-#: ../src/hooks.c:546
+#: ../src/hooks.c:665
 msgid "Click on the notification icon to show the available information.\n"
 msgstr "ያሉ መልዕክቶችን ለማየት የመልዕክት ቁልፉን ይጫኑ፡፡\n"
 
-#: ../src/reboot.c:29 ../src/reboot.c:277
-msgid "System restart required"
-msgstr "ስርዓቱን እንደገና መጀመር ይስፈልጋል"
-
-#: ../src/reboot.c:30
-msgid ""
-"To finish updating your system, please restart it.\n"
-"\n"
-"Click on the notification icon for details."
-msgstr ""
-
-#: ../src/reboot.c:104
-msgid "Reboot failed"
-msgstr "እንደገና ማስነሳት ወድቋል"
-
-#: ../src/reboot.c:105
-msgid "Failed to request reboot, please shutdown manually"
-msgstr ""
-
-#: ../src/update.c:27
+#: ../src/update.c:28
 msgid "Show updates"
 msgstr "የተሻሻሉትን አሳይ"
 
-#: ../src/update.c:31
+#: ../src/update.c:32
 msgid "Install all updates"
 msgstr "የተሻሻሉት ስልቶች ሁሉ ትከል፡"
 
-#: ../src/update.c:35
+#: ../src/update.c:36
 msgid "Check for updates"
 msgstr "ለማሻሻያዎች ይህንን ይምረጡ"
 
-#: ../src/update.c:80
+#: ../src/update.c:83
 #, c-format
 msgid "There is %i update available"
 msgid_plural "There are %i updates available"
 msgstr[0] "%i ማሻሻያ አለ"
 msgstr[1] "%i ማሻሻያዎች አሉ"
 
-#: ../src/update.c:149
+#: ../src/update.c:147
 msgid "Show notifications"
 msgstr "መልዕክቶችን አሳይ"
 
 #. and update the tooltip
-#: ../src/update.c:208
+#: ../src/update.c:203
 msgid "A package manager is working"
 msgstr "የጥቅል አስተዳዳሪው እየስራ ነው"
 
-#: ../src/update.c:240
+#: ../src/update.c:235
 #, c-format
 msgid ""
 "There is %i update available. Click on the notification icon to show the "
@@ -239,19 +233,19 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/update.c:251
+#: ../src/update.c:246
 msgid "Software updates available"
 msgstr "የስልት ማሻሻያዎች አሉ"
 
-#: ../src/update.c:287
+#: ../src/update.c:284
 msgid ""
 "The update information is outdated. This may be caused by network problems "
 "or by a repository that is no longer available. Please update manually by "
-"clicking on this icon and then selecting 'Check for updates' and check if "
-"some of the listed repositories fail."
+"selecting 'Show updates' from the indicator menu, and watching for any "
+"failing repositories."
 msgstr ""
 
-#: ../src/update.c:582
+#: ../src/update.c:574
 #, c-format
 msgid ""
 "An error occurred, please run Package Manager from the right-click menu or "
@@ -259,39 +253,34 @@ msgid ""
 "The error message was: '%s'. "
 msgstr ""
 
-#: ../src/update.c:589
+#: ../src/update.c:581
 msgid ""
 "An error occurred, please run Package Manager from the right-click menu or "
 "apt-get in a terminal to see what is wrong."
 msgstr ""
 
-#: ../src/update.c:593
-msgid ""
-"This usually means that your installed packages have unmet dependencies"
+#: ../src/update.c:585
+msgid "This usually means that your installed packages have unmet dependencies"
 msgstr "እንደተለመደው ይህ የተተከሉት ጥቅሎች ደጋፊዎች ሙሉበሙሉ አልተገኙም ማለት ነው፡፡"
 
-#: ../src/update.c:606
+#: ../src/update.c:598
 msgid "A problem occurred when checking for the updates."
 msgstr "ስህተት ተፈጥሯል ማሻሻያ በሚፈለገበት ጊዜ"
 
-#: ../src/update-notifier.c:402
-msgid "Internal error"
-msgstr "ውስጣዊ ስህተት"
-
-#: ../src/update-notifier.c:570
+#: ../src/update-notifier.c:541
 msgid "- inform about updates"
 msgstr "- ማሳወቅ ስለ ማሻሻያው"
 
-#: ../src/update-notifier.c:572
+#: ../src/update-notifier.c:543
 #, c-format
 msgid "Failed to init the UI: %s\n"
 msgstr ""
 
-#: ../src/update-notifier.c:573
+#: ../src/update-notifier.c:544
 msgid "unknown error"
 msgstr "ያልታወቀ ስህተት"
 
-#: ../src/update-notifier.c:596
+#: ../src/update-notifier.c:569
 msgid "update-notifier"
 msgstr "ማሻሻያ-አሳዋቂ"
 
@@ -299,35 +288,24 @@ msgstr "ማሻሻያ-አሳዋቂ"
 msgid "<span weight=\"bold\" size=\"larger\">Update information</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">መረጃ የማሻሻያው</span>"
 
-#: ../ui/reboot-dialog.ui.h:1
-msgid "Restart Required"
-msgstr "እንደገና ማስነሳት ያስፈልጋል"
-
-#: ../ui/reboot-dialog.ui.h:2
-msgid "Restart _Later"
-msgstr "ቆይተህ እንደገና _ጀምር"
-
-#: ../ui/reboot-dialog.ui.h:4
-msgid "_Restart Now"
-msgstr "አሁን እንደገና _ጀምር"
+#: ../data/com.ubuntu.update-notifier.policy.in.h:1
+msgid "Authentication is needed to upgrade"
+msgstr ""
 
-#: ../ui/reboot-dialog.ui.h:3
-msgid ""
-"The computer needs to restart to finish installing updates. Please save your "
-"work before continuing."
+#: ../data/com.ubuntu.update-notifier.policy.in.h:2
+msgid "Authentication is needed to query package system lock status"
 msgstr ""
-"ኮምፒዩተሩን አጥፍቶ ማብራት ያስፈልጋል ማሻሻያውን ገጥሞ ለመጨረስ። እባክዎን የሚሰሩትን ያስቀምጡ ከመቀጠሎት በፊት"
 
-#: ../data/update-notifier.desktop.in.h:2
+#: ../data/update-notifier.desktop.in.h:1
 msgid "Update Notifier"
 msgstr "የማሻሻያ አሳሳቢ"
 
-#: ../data/update-notifier.desktop.in.h:1
+#: ../data/update-notifier.desktop.in.h:2
 msgid "Check for available updates automatically"
 msgstr ""
 
 #. Name
-#: ../data/package-data-downloads-failed.in:1
+#: ../data/package-data-downloads-failed.in:2
 msgid "Failure to download extra data files"
 msgstr ""
 
@@ -353,7 +331,7 @@ msgid ""
 msgstr ""
 
 #. Name
-#: ../data/package-data-downloads-failed-permanently.in:1
+#: ../data/package-data-downloads-failed-permanently.in:2
 msgid "Data files for some packages could not be downloaded"
 msgstr ""
 
@@ -364,3 +342,27 @@ msgid ""
 "system.  You may need to fix your Internet connection, then remove and "
 "reinstall the packages to fix this problem."
 msgstr ""
+
+#~ msgid "System restart required"
+#~ msgstr "ስርዓቱን እንደገና መጀመር ይስፈልጋል"
+
+#~ msgid "Reboot failed"
+#~ msgstr "እንደገና ማስነሳት ወድቋል"
+
+#~ msgid "Internal error"
+#~ msgstr "ውስጣዊ ስህተት"
+
+#~ msgid "Restart Required"
+#~ msgstr "እንደገና ማስነሳት ያስፈልጋል"
+
+#~ msgid "Restart _Later"
+#~ msgstr "ቆይተህ እንደገና _ጀምር"
+
+#~ msgid "_Restart Now"
+#~ msgstr "አሁን እንደገና _ጀምር"
+
+#~ msgid ""
+#~ "The computer needs to restart to finish installing updates. Please save "
+#~ "your work before continuing."
+#~ msgstr ""
+#~ "ኮምፒዩተሩን አጥፍቶ ማብራት ያስፈልጋል ማሻሻያውን ገጥሞ ለመጨረስ። እባክዎን የሚሰሩትን ያስቀምጡ ከመቀጠሎት በፊት"
diff --git a/po/an.po b/po/an.po
index f4aad8c..b34862a 100644
--- a/po/an.po
+++ b/po/an.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: update-notifier\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-10 12:15+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-11-19 05:31+0000\n"
 "PO-Revision-Date: 2011-05-04 11:57+0000\n"
 "Last-Translator: Daniel Martinez <[e-mail]>\n"
 "Language-Team: Aragonese <[e-mail]>\n"
+"Language: an\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,43 +24,77 @@ msgstr ""
 msgid "Unknown Error: '%s' (%s)"
 msgstr "Error desconoixiu: '%s' (%s)"
 
-#: ../data/apt_check.py:66
+#: ../data/apt_check.py:82
+msgid "UA Infra: Extended Security Maintenance (ESM) is enabled."
+msgstr ""
+
+#: ../data/apt_check.py:87
+msgid "UA Infra: Extended Security Maintenance (ESM) is not enabled."
+msgstr ""
+
+#: ../data/apt_check.py:93
 #, python-format
 msgid "%i package can be updated."
 msgid_plural "%i packages can be updated."
 msgstr[0] "Ye posible d'esviellar %i paquete."
 msgstr[1] "Son posibles d'esviellar %i paquetes."
 
-#: ../data/apt_check.py:71
+#: ../data/apt_check.py:99
 #, python-format
-msgid "%i update is a security update."
-msgid_plural "%i updates are security updates."
+msgid "%i of these updates is fixed through UA Infra: ESM."
+msgid_plural "%i of these updates are fixed through UA Infra: ESM."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../data/apt_check.py:108
+#, fuzzy, python-format
+msgid "%i of these updates is a security update."
+msgid_plural "%i of these updates are security updates."
 msgstr[0] "%i esvielle ye de seguridat."
 msgstr[1] "%i esvielles son de seguridat."
 
-#: ../data/apt_check.py:97
+#: ../data/apt_check.py:117
+msgid "To see these additional updates run: apt list --upgradable"
+msgstr ""
+
+#: ../data/apt_check.py:124
+#, python-format
+msgid "Enable UA Infra: ESM to receive %i additional security update."
+msgid_plural "Enable UA Infra: ESM to receive %i additional security updates."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../data/apt_check.py:135
+msgid "Enable UA Infra: ESM to receive additional future security updates."
+msgstr ""
+
+#: ../data/apt_check.py:140
+msgid "See https://ubuntu.com/security/esm or run: sudo ua status"
+msgstr ""
+
+#: ../data/apt_check.py:181
 #, python-format
 msgid "Error: Opening the cache (%s)"
 msgstr "Error: Ubriendo la caché (%s)"
 
-#: ../data/apt_check.py:111
+#: ../data/apt_check.py:191
 msgid "Error: BrokenCount > 0"
 msgstr "Error: BrokenCount > 0"
 
-#: ../data/apt_check.py:118
+#: ../data/apt_check.py:198
 #, python-format
 msgid "Error: Marking the upgrade (%s)"
 msgstr "Error: Marcando l'esvielle (%s)"
 
-#: ../data/apt_check.py:182
+#: ../data/apt_check.py:304
 msgid "Show the packages that are going to be installed/upgraded"
 msgstr "Amostra los paquetes que van a estar instalaus u esviellaus"
 
-#: ../data/apt_check.py:187
+#: ../data/apt_check.py:309
 msgid "Show human readable output on stdout"
 msgstr "Amuestra una surtida leyible ta humans por stdout"
 
-#: ../data/apt_check.py:191
+#: ../data/apt_check.py:313
 msgid ""
 "Return the time in days when security updates are installed unattended (0 "
 "means disabled)"
@@ -67,53 +102,45 @@ msgstr ""
 "Torna o tiempo en diyas en que os esvielles de seguridat s'instalan de traza "
 "desatendida (0 sinnifica desactivau)."
 
-#: ../src/crash.c:45
+#: ../src/crash.c:46
 msgid "System program problem detected"
 msgstr "S'ha detectau un problema en un programa d'o sistema"
 
-#: ../src/crash.c:46
+#: ../src/crash.c:47
 msgid "Do you want to report the problem now?"
 msgstr "¿Quiere informar d'iste problema agora?"
 
-#: ../src/crash.c:56
+#: ../src/crash.c:57
 msgid "Report problem…"
 msgstr "Informar d'o problema..."
 
-#: ../src/crash.c:72
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Please enter your password to access "
-"problem reports of system programs</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Meta o suya clau de paso ta acceder a "
-"os informes d'os programas d'o sistema</span>"
-
-#: ../src/crash.c:92 ../src/crash.c:218
+#: ../src/crash.c:95 ../src/crash.c:185
 msgid "Crash report detected"
 msgstr "S'ha detectau un informe de fallo"
 
-#: ../src/crash.c:93
+#: ../src/crash.c:96
 msgid ""
 "An application has crashed on your system (now or in the past). Click on the "
 "notification icon to display details. "
 msgstr ""
 
 #. Create and show the notification
-#: ../src/avahi.c:15
+#: ../src/avahi.c:16
 msgid "Network service discovery disabled"
 msgstr "Servicio d'autodetección de rete desactivau"
 
-#: ../src/avahi.c:16
+#: ../src/avahi.c:17
 msgid ""
 "Your current network has a .local domain, which is not recommended and "
 "incompatible with the Avahi network service discovery. The service has been "
 "disabled."
 msgstr ""
 
-#: ../src/gdu.c:53
+#: ../src/cdroms.c:48
 msgid "Software Packages Volume Detected"
 msgstr "Volumen de paquetz de software detectau"
 
-#: ../src/gdu.c:54
+#: ../src/cdroms.c:49
 msgid ""
 "<span weight=\"bold\" size=\"larger\">A volume with software packages has "
 "been detected.</span>\n"
@@ -121,15 +148,15 @@ msgid ""
 "Would you like to open it with the package manager?"
 msgstr ""
 
-#: ../src/gdu.c:62
+#: ../src/cdroms.c:57
 msgid "Start Package Manager"
 msgstr "Prencipiar chestor de paquetes"
 
-#: ../src/gdu.c:68
+#: ../src/cdroms.c:63
 msgid "Upgrade volume detected"
 msgstr "Volumen d'esvielle detectau"
 
-#: ../src/gdu.c:69
+#: ../src/cdroms.c:64
 msgid ""
 "<span weight=\"bold\" size=\"larger\">A distribution volume with software "
 "packages has been detected.</span>\n"
@@ -137,35 +164,15 @@ msgid ""
 "Would you like to try to upgrade from it automatically? "
 msgstr ""
 
-#: ../src/gdu.c:76
+#: ../src/cdroms.c:71
 msgid "Run upgrade"
 msgstr "Prencipiar esvielle"
 
-#: ../src/gdu.c:82
-msgid "Addon volume detected"
-msgstr "S'ha detectau un disco suplementario"
-
-#: ../src/gdu.c:83
-msgid ""
-"<span weight=\"bold\" size=\"larger\">An addon volume with software "
-"applications has been detected.</span>\n"
-"\n"
-"Would you like to view/install the content? "
-msgstr ""
-
-#: ../src/gdu.c:90 ../src/gdu.c:109
-msgid "Start package manager"
-msgstr "Prencipiar chestor de paquetes"
-
-#: ../src/gdu.c:92
-msgid "Start addon installer"
-msgstr "Encetar l'instalador de complementos"
-
-#: ../src/gdu.c:100
+#: ../src/cdroms.c:79
 msgid "APTonCD volume detected"
 msgstr "S'ha detectau un volumen APTonCD"
 
-#: ../src/gdu.c:101
+#: ../src/cdroms.c:80
 msgid ""
 "<span weight=\"bold\" size=\"larger\">A volume with unofficial software "
 "packages has been detected.</span>\n"
@@ -173,67 +180,52 @@ msgid ""
 "Would you like to open it with the package manager?"
 msgstr ""
 
-#: ../src/hooks.c:346 ../ui/hooks-dialog.ui.h:2
+#: ../src/cdroms.c:88 ../src/update.c:39
+msgid "Start package manager"
+msgstr "Prencipiar chestor de paquetes"
+
+#: ../src/hooks.c:362 ../ui/hooks-dialog.ui.h:2
 msgid "_Run this action now"
 msgstr "_Echecutar ista aición agora"
 
-#: ../src/hooks.c:418 ../src/hooks.c:545 ../src/hooks.c:875
+#: ../src/hooks.c:514 ../src/hooks.c:664
 msgid "Information available"
 msgstr "Información disposable"
 
-#: ../src/hooks.c:546
+#: ../src/hooks.c:665
 msgid "Click on the notification icon to show the available information.\n"
 msgstr ""
 "Prete en l'icono de notificacion ta amostrar a informacion disponible.\n"
 
-#: ../src/reboot.c:29 ../src/reboot.c:277
-msgid "System restart required"
-msgstr "Cal reiniciar o sistema"
-
-#: ../src/reboot.c:30
-msgid ""
-"To finish updating your system, please restart it.\n"
-"\n"
-"Click on the notification icon for details."
-msgstr ""
-
-#: ../src/reboot.c:104
-msgid "Reboot failed"
-msgstr "Ha fallau lo reinicio"
-
-#: ../src/reboot.c:105
-msgid "Failed to request reboot, please shutdown manually"
-msgstr ""
-
-#: ../src/update.c:27
+#: ../src/update.c:28
 msgid "Show updates"
 msgstr "Amostrar esvielles"
 
-#: ../src/update.c:31
+#: ../src/update.c:32
 msgid "Install all updates"
 msgstr "Instalar toz os esvielles"
 
-#: ../src/update.c:35
+#: ../src/update.c:36
 msgid "Check for updates"
 msgstr "Comprebar si bi ha esvielles"
 
-#: ../src/update.c:80
+#: ../src/update.c:83
 #, c-format
 msgid "There is %i update available"
 msgid_plural "There are %i updates available"
 msgstr[0] "Bi ha %i esvielle disposable"
 msgstr[1] "Bi ha %i esvielles disposables"
 
-#: ../src/update.c:149
+#: ../src/update.c:147
 msgid "Show notifications"
 msgstr "Amostrar notificacions"
 
 #. and update the tooltip
-#: ../src/update.c:208
+#: ../src/update.c:203
 msgid "A package manager is working"
 msgstr "Bi ha un chestor de paquetes treballando"
 
-#: ../src/update.c:240
+#: ../src/update.c:235
 #, c-format
 msgid ""
 "There is %i update available. Click on the notification icon to show the "
@@ -248,19 +240,19 @@ msgstr[1] ""
 "Bi ha %i esvielles disponibles. Prete en l'icono de notificacion ta amostrar "
 "os esvielles disponibles."
 
-#: ../src/update.c:251
+#: ../src/update.c:246
 msgid "Software updates available"
 msgstr "Bi ha esvielles de software disposables"
 
-#: ../src/update.c:287
+#: ../src/update.c:284
 msgid ""
 "The update information is outdated. This may be caused by network problems "
 "or by a repository that is no longer available. Please update manually by "
-"clicking on this icon and then selecting 'Check for updates' and check if "
-"some of the listed repositories fail."
+"selecting 'Show updates' from the indicator menu, and watching for any "
+"failing repositories."
 msgstr ""
 
-#: ../src/update.c:582
+#: ../src/update.c:574
 #, c-format
 msgid ""
 "An error occurred, please run Package Manager from the right-click menu or "
@@ -268,39 +260,34 @@ msgid ""
 "The error message was: '%s'. "
 msgstr ""
 
-#: ../src/update.c:589
+#: ../src/update.c:581
 msgid ""
 "An error occurred, please run Package Manager from the right-click menu or "
 "apt-get in a terminal to see what is wrong."
 msgstr ""
 
-#: ../src/update.c:593
-msgid ""
-"This usually means that your installed packages have unmet dependencies"
+#: ../src/update.c:585
+msgid "This usually means that your installed packages have unmet dependencies"
 msgstr ""
 
-#: ../src/update.c:606
+#: ../src/update.c:598
 msgid "A problem occurred when checking for the updates."
 msgstr ""
 
-#: ../src/update-notifier.c:402
-msgid "Internal error"
-msgstr "Error interno"
-
-#: ../src/update-notifier.c:570
+#: ../src/update-notifier.c:541
 msgid "- inform about updates"
 msgstr ""
 
-#: ../src/update-notifier.c:572
+#: ../src/update-notifier.c:543
 #, c-format
 msgid "Failed to init the UI: %s\n"
 msgstr ""
 
-#: ../src/update-notifier.c:573
+#: ../src/update-notifier.c:544
 msgid "unknown error"
 msgstr "error desconoxiu"
 
-#: ../src/update-notifier.c:596
+#: ../src/update-notifier.c:569
 msgid "update-notifier"
 msgstr "Notificador d'esvielles"
 
@@ -308,34 +295,24 @@ msgstr "Notificador d'esvielles"
 msgid "<span weight=\"bold\" size=\"larger\">Update information</span>"
 msgstr ""
 
-#: ../ui/reboot-dialog.ui.h:1
-msgid "Restart Required"
-msgstr "Cal reiniciar"
-
-#: ../ui/reboot-dialog.ui.h:2
-msgid "Restart _Later"
+#: ../data/com.ubuntu.update-notifier.policy.in.h:1
+msgid "Authentication is needed to upgrade"
 msgstr ""
 
-#: ../ui/reboot-dialog.ui.h:4
-msgid "_Restart Now"
-msgstr "_Reiniciar agora"
-
-#: ../ui/reboot-dialog.ui.h:3
-msgid ""
-"The computer needs to restart to finish installing updates. Please save your "
-"work before continuing."
+#: ../data/com.ubuntu.update-notifier.policy.in.h:2
+msgid "Authentication is needed to query package system lock status"
 msgstr ""
 
-#: ../data/update-notifier.desktop.in.h:2
+#: ../data/update-notifier.desktop.in.h:1
 msgid "Update Notifier"
 msgstr "Notificador d'esvielles"
 
-#: ../data/update-notifier.desktop.in.h:1
+#: ../data/update-notifier.desktop.in.h:2
 msgid "Check for available updates automatically"
 msgstr "Comprebar automaticament os esvielles disponibles"
 
 #. Name
-#: ../data/package-data-downloads-failed.in:1
+#: ../data/package-data-downloads-failed.in:2
 msgid "Failure to download extra data files"
 msgstr ""
 
@@ -361,7 +338,7 @@ msgid ""
 msgstr ""
 
 #. Name
-#: ../data/package-data-downloads-failed-permanently.in:1
+#: ../data/package-data-downloads-failed-permanently.in:2
 msgid "Data files for some packages could not be downloaded"
 msgstr ""
 
@@ -372,3 +349,31 @@ msgid ""
 "system.  You may need to fix your Internet connection, then remove and "
 "reinstall the packages to fix this problem."
 msgstr ""
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Please enter your password to "
+#~ "access problem reports of system programs</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Meta o suya clau de paso ta acceder "
+#~ "a os informes d'os programas d'o sistema</span>"
+
+#~ msgid "Addon volume detected"
+#~ msgstr "S'ha detectau un disco suplementario"
+
+#~ msgid "Start addon installer"
+#~ msgstr "Encetar l'instalador de complementos"
+
+#~ msgid "System restart required"
+#~ msgstr "Cal reiniciar o sistema"
+
+#~ msgid "Reboot failed"
+#~ msgstr "Ha fallau lo reinicio"
+
+#~ msgid "Internal error"
+#~ msgstr "Error interno"
+
+#~ msgid "Restart Required"
+#~ msgstr "Cal reiniciar"
+
+#~ msgid "_Restart Now"
+#~ msgstr "_Reiniciar agora"
diff --git a/po/ar.po b/po/ar.po
index 6247723..d53187b 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -10,10 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: po_update-notifier-ar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-10 12:15+0100\n"
+"POT-Creation-Date: 2020-11-19 05:31+0000\n"
 "PO-Revision-Date: 2012-09-06 02:40+0000\n"
 "Last-Translator: Ibrahim Saed <[e-mail]>\n"
 "Language-Team: Arabic\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,7 +28,15 @@ msgstr ""
 msgid "Unknown Error: '%s' (%s)"
 msgstr "خطأ مجهول: '%s' ‏(%s)"
 
-#: ../data/apt_check.py:66
+#: ../data/apt_check.py:82
+msgid "UA Infra: Extended Security Maintenance (ESM) is enabled."
+msgstr ""
+
+#: ../data/apt_check.py:87
+msgid "UA Infra: Extended Security Maintenance (ESM) is not enabled."
+msgstr ""
+
+#: ../data/apt_check.py:93
 #, python-format
 msgid "%i package can be updated."
 msgid_plural "%i packages can be updated."
@@ -38,10 +47,21 @@ msgstr[3] "%i حزم يمكن تحديثها."
 msgstr[4] "%i حزمة يمكن تحديثها."
 msgstr[5] "%i حزمة يمكن تحديثها."
 
-#: ../data/apt_check.py:71
+#: ../data/apt_check.py:99
 #, python-format
-msgid "%i update is a security update."
-msgid_plural "%i updates are security updates."
+msgid "%i of these updates is fixed through UA Infra: ESM."
+msgid_plural "%i of these updates are fixed through UA Infra: ESM."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: ../data/apt_check.py:108
+#, fuzzy, python-format
+msgid "%i of these updates is a security update."
+msgid_plural "%i of these updates are security updates."
 msgstr[0] "لا تحديثات أمنية."
 msgstr[1] "تحديث أمني واحد."
 msgstr[2] "تحديثين أمنيّين."
@@ -49,59 +69,74 @@ msgstr[3] "%i تحديثات أمنية."
 msgstr[4] "%i تحديثا أمنيا."
 msgstr[5] "%i تحديث أمنيا."
 
-#: ../data/apt_check.py:97
+#: ../data/apt_check.py:117
+msgid "To see these additional updates run: apt list --upgradable"
+msgstr ""
+
+#: ../data/apt_check.py:124
+#, python-format
+msgid "Enable UA Infra: ESM to receive %i additional security update."
+msgid_plural "Enable UA Infra: ESM to receive %i additional security updates."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: ../data/apt_check.py:135
+msgid "Enable UA Infra: ESM to receive additional future security updates."
+msgstr ""
+
+#: ../data/apt_check.py:140
+msgid "See https://ubuntu.com/security/esm or run: sudo ua status"
+msgstr ""
+
+#: ../data/apt_check.py:181
 #, python-format
 msgid "Error: Opening the cache (%s)"
 msgstr "خطأ: فتح الخبيئة (%s)"
 
-#: ../data/apt_check.py:111
+#: ../data/apt_check.py:191
 msgid "Error: BrokenCount > 0"
 msgstr "خطأ: عداد الانكسار > 0"
 
-#: ../data/apt_check.py:118
+#: ../data/apt_check.py:198
 #, python-format
 msgid "Error: Marking the upgrade (%s)"
 msgstr "خطأ: تعليم الترقية (%s)"
 
-#: ../data/apt_check.py:182
+#: ../data/apt_check.py:304
 msgid "Show the packages that are going to be installed/upgraded"
 msgstr "أظهر الحزم التي ستثبت/سترقّى"
 
-#: ../data/apt_check.py:187
+#: ../data/apt_check.py:309
 msgid "Show human readable output on stdout"
 msgstr "أظهر مخرج مقروء من البشر على stdout"
 
-#: ../data/apt_check.py:191
+#: ../data/apt_check.py:313
 msgid ""
 "Return the time in days when security updates are installed unattended (0 "
 "means disabled)"
 msgstr "أظهر الزمن بالأيام عند تثبيت تحديثات أمنية تلقائيًا (0 يعني التعطيل)"
 
-#: ../src/crash.c:45
+#: ../src/crash.c:46
 msgid "System program problem detected"
 msgstr "تم اكتشاف مشكلة في برنامج النظام"
 
-#: ../src/crash.c:46
+#: ../src/crash.c:47
 msgid "Do you want to report the problem now?"
 msgstr "أتريد الإبلاغ عن المشكلة الآن؟"
 
-#: ../src/crash.c:56
+#: ../src/crash.c:57
 msgid "Report problem…"
 msgstr "أبلغ عن مشكلة..."
 
-#: ../src/crash.c:72
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Please enter your password to access "
-"problem reports of system programs</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">من فضلك أدخل كلمة السر لتَنفُذ إلى "
-"الإبلاغ عن أعطال برمجيات النظام</span>"
-
-#: ../src/crash.c:92 ../src/crash.c:218
+#: ../src/crash.c:95 ../src/crash.c:185
 msgid "Crash report detected"
 msgstr "يوجد تقرير انهيار"
 
-#: ../src/crash.c:93
+#: ../src/crash.c:96
 msgid ""
 "An application has crashed on your system (now or in the past). Click on the "
 "notification icon to display details. "
@@ -110,11 +145,11 @@ msgstr ""
 "التفاصيل. "
 
 #. Create and show the notification
-#: ../src/avahi.c:15
+#: ../src/avahi.c:16
 msgid "Network service discovery disabled"
 msgstr "عُطِّل استكشاف خدمة الشبكة"
 
-#: ../src/avahi.c:16
+#: ../src/avahi.c:17
 msgid ""
 "Your current network has a .local domain, which is not recommended and "
 "incompatible with the Avahi network service discovery. The service has been "
@@ -123,11 +158,11 @@ msgstr ""
 "لشبكتك الحالية نطاق .local، وهو ما لا ينصح به وليس متوافقا مع استكشاف خدمة "
 "الشبكة Avahi. عُطِّلت الخدمة."
 
-#: ../src/gdu.c:53
+#: ../src/cdroms.c:48
 msgid "Software Packages Volume Detected"
 msgstr "حجوم حزم البرمجيات اكتشفت"
 
-#: ../src/gdu.c:54
+#: ../src/cdroms.c:49
 msgid ""
 "<span weight=\"bold\" size=\"larger\">A volume with software packages has "
 "been detected.</span>\n"
@@ -138,116 +173,75 @@ msgstr ""
 "\n"
 "أترغب في فتحه بمدير الحزم؟"
 
-#: ../src/gdu.c:62
+#: ../src/cdroms.c:57
 msgid "Start Package Manager"
 msgstr "ابدأ مدير الحزم"
 
-#: ../src/gdu.c:68
+#: ../src/cdroms.c:63
 msgid "Upgrade volume detected"
 msgstr "يوجد مجلد ترقية"
 
-#: ../src/gdu.c:69
+#: ../src/cdroms.c:64
 msgid ""
 "<span weight=\"bold\" size=\"larger\">A distribution volume with software "
 "packages has been detected.</span>\n"
 "\n"
 "Would you like to try to upgrade from it automatically? "
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">يوجد مجلد توزيعة يحوي حزما "
-"برمجية.</span>\n"
+"<span weight=\"bold\" size=\"larger\">يوجد مجلد توزيعة يحوي حزما برمجية.</"
+"span>\n"
 "\n"
 "أترغب في محاولة الترقية منه آليا؟ "
 
-#: ../src/gdu.c:76
+#: ../src/cdroms.c:71
 msgid "Run upgrade"
 msgstr "أجرِ الترقية"
 
-#: ../src/gdu.c:82
-msgid "Addon volume detected"
-msgstr "يوجد مجلد ملحقات"
-
-#: ../src/gdu.c:83
-msgid ""
-"<span weight=\"bold\" size=\"larger\">An addon volume with software "
-"applications has been detected.</span>\n"
-"\n"
-"Would you like to view/install the content? "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">يوجد مجلد يحوي تطبيقات برمجية.</span>\n"
-"\n"
-"أتريد استعراض أو تثبيت المحتويات؟ "
-
-#: ../src/gdu.c:90 ../src/gdu.c:109
-msgid "Start package manager"
-msgstr "ابدء مدير الحزم"
-
-#: ../src/gdu.c:92
-msgid "Start addon installer"
-msgstr "ابدأ مثبت الملحقات"
-
-#: ../src/gdu.c:100
+#: ../src/cdroms.c:79
 msgid "APTonCD volume detected"
 msgstr "يوجد مجلد APTonCD"
 
-#: ../src/gdu.c:101
+#: ../src/cdroms.c:80
 msgid ""
 "<span weight=\"bold\" size=\"larger\">A volume with unofficial software "
 "packages has been detected.</span>\n"
 "\n"
 "Would you like to open it with the package manager?"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">يوجد مجلد يحوي حزما برمجية غير "
-"رسمية.</span>\n"
+"<span weight=\"bold\" size=\"larger\">يوجد مجلد يحوي حزما برمجية غير رسمية.</"
+"span>\n"
 "\n"
 "أتريد فتحه بمدير الحزم؟"
 
-#: ../src/hooks.c:346 ../ui/hooks-dialog.ui.h:2
+#: ../src/cdroms.c:88 ../src/update.c:39
+msgid "Start package manager"
+msgstr "ابدء مدير الحزم"
+
+#: ../src/hooks.c:362 ../ui/hooks-dialog.ui.h:2
 msgid "_Run this action now"
 msgstr "_شغل هذا الإجراء اﻵن"
 
-#: ../src/hooks.c:418 ../src/hooks.c:545 ../src/hooks.c:875
+#: ../src/hooks.c:514 ../src/hooks.c:664
 msgid "Information available"
 msgstr "توجد معلومات"
 
-#: ../src/hooks.c:546
+#: ../src/hooks.c:665
 msgid "Click on the notification icon to show the available information.\n"
 msgstr "انقر على أيقونة التبليغ لتستعرض المعلومات المتوفرة.\n"
 
-#: ../src/reboot.c:29 ../src/reboot.c:277
-msgid "System restart required"
-msgstr "يجب  إعادة تشغيل النظام"
-
-#: ../src/reboot.c:30
-msgid ""
-"To finish updating your system, please restart it.\n"
-"\n"
-"Click on the notification icon for details."
-msgstr ""
-"للإنتهاء من تحديث نظامك، رجاءاً أعد التشغيل.\n"
-"\n"
-"إضغط على أيقونة الإشعارات للتفاصيل."
-
-#: ../src/reboot.c:104
-msgid "Reboot failed"
-msgstr "فشلت إعادة الإقلاع"
-
-#: ../src/reboot.c:105
-msgid "Failed to request reboot, please shutdown manually"
-msgstr "فشل طلب إعادة الإقلاع، من فضلك أغلق الجهاز يدويا"
-
-#: ../src/update.c:27
+#: ../src/update.c:28
 msgid "Show updates"
 msgstr "اعرض التحديثات"
 
-#: ../src/update.c:31
+#: ../src/update.c:32
 msgid "Install all updates"
 msgstr "ثبِّت كل التحديثات"
 
-#: ../src/update.c:35
+#: ../src/update.c:36
 msgid "Check for updates"
 msgstr "التمس تحديثات"
 
-#: ../src/update.c:80
+#: ../src/update.c:83
 #, c-format
 msgid "There is %i update available"
 msgid_plural "There are %i updates available"
@@ -258,16 +252,16 @@ msgstr[3] "توجد %i تحديثات"
 msgstr[4] "يوجد %i تحديثا"
 msgstr[5] "يوجد %i تحديثات"
 
-#: ../src/update.c:149
+#: ../src/update.c:147
 msgid "Show notifications"
 msgstr "اعرض التبليغات"
 
 #. and update the tooltip
-#: ../src/update.c:208
+#: ../src/update.c:203
 msgid "A package manager is working"
 msgstr "يعمل بالفعل مدير حزم"
 
-#: ../src/update.c:240
+#: ../src/update.c:235
 #, c-format
 msgid ""
 "There is %i update available. Click on the notification icon to show the "
@@ -287,22 +281,23 @@ msgstr[4] ""
 msgstr[5] ""
 "يوجد %i تحديث متوفر. انقر على أيقونة التبليغ لإظهار التحديثات المتوفرة."
 
-#: ../src/update.c:251
+#: ../src/update.c:246
 msgid "Software updates available"
 msgstr "توجد تحديثات برمجية"
 
-#: ../src/update.c:287
+#: ../src/update.c:284
+#, fuzzy
 msgid ""
 "The update information is outdated. This may be caused by network problems "
 "or by a repository that is no longer available. Please update manually by "
-"clicking on this icon and then selecting 'Check for updates' and check if "
-"some of the listed repositories fail."
+"selecting 'Show updates' from the indicator menu, and watching for any "
+"failing repositories."
 msgstr ""
 "معلومات التحديث قديمة. قد يكون هذا بسبب مشاكل في الشبكة أو مستودع لم يعد "
 "متاحا. من فضلك حدّث يدويا باختيار 'التمس تحديثات' وتفقّد ما إذا كانت بعض "
 "المستودعات تفشل."
 
-#: ../src/update.c:582
+#: ../src/update.c:574
 #, c-format
 msgid ""
 "An error occurred, please run Package Manager from the right-click menu or "
@@ -313,7 +308,7 @@ msgstr ""
 "الطرفية لترى ما الخطأ.\n"
 "رسالة الخطأ كانت: '%s'. "
 
-#: ../src/update.c:589
+#: ../src/update.c:581
 msgid ""
 "An error occurred, please run Package Manager from the right-click menu or "
 "apt-get in a terminal to see what is wrong."
@@ -321,33 +316,28 @@ msgstr ""
 "حدث عطل. رجاءً شغّل مدير الحزم من قائمة السياق أو apt-get في مرقاب لترى ما "
 "العطل."
 
-#: ../src/update.c:593
-msgid ""
-"This usually means that your installed packages have unmet dependencies"
+#: ../src/update.c:585
+msgid "This usually means that your installed packages have unmet dependencies"
 msgstr "يعني هذا غالبا أن حزمك المثبتة تنقصها اعتماديات"
 
-#: ../src/update.c:606
+#: ../src/update.c:598
 msgid "A problem occurred when checking for the updates."
 msgstr "طرأت مشكلة أثناء التماس تحديثات."
 
-#: ../src/update-notifier.c:402
-msgid "Internal error"
-msgstr "عطل داخلي"
-
-#: ../src/update-notifier.c:570
+#: ../src/update-notifier.c:541
 msgid "- inform about updates"
 msgstr "- أبلغ بالتحديثات"
 
-#: ../src/update-notifier.c:572
+#: ../src/update-notifier.c:543
 #, c-format
 msgid "Failed to init the UI: %s\n"
 msgstr "فشل بدء واجهة الاستخدام: %s\n"
 
-#: ../src/update-notifier.c:573
+#: ../src/update-notifier.c:544
 msgid "unknown error"
 msgstr "خطأ مجهول"
 
-#: ../src/update-notifier.c:596
+#: ../src/update-notifier.c:569
 msgid "update-notifier"
 msgstr "update-notifier"
 
@@ -355,36 +345,24 @@ msgstr "update-notifier"
 msgid "<span weight=\"bold\" size=\"larger\">Update information</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">معلومات التحديث</span>"
 
-#: ../ui/reboot-dialog.ui.h:1
-msgid "Restart Required"
-msgstr "إعادة التشغيل مطلوبة"
-
-#: ../ui/reboot-dialog.ui.h:2
-msgid "Restart _Later"
-msgstr "أعد التشغيل _لاحقا"
-
-#: ../ui/reboot-dialog.ui.h:4
-msgid "_Restart Now"
-msgstr "أعد التشغيل اﻵ_ن"
+#: ../data/com.ubuntu.update-notifier.policy.in.h:1
+msgid "Authentication is needed to upgrade"
+msgstr ""
 
-#: ../ui/reboot-dialog.ui.h:3
-msgid ""
-"The computer needs to restart to finish installing updates. Please save your "
-"work before continuing."
+#: ../data/com.ubuntu.update-notifier.policy.in.h:2
+msgid "Authentication is needed to query package system lock status"
 msgstr ""
-"يحتاج الحاسوب لإعادة التشغيل لتطبيق التحديثات. من فضلك احفظ عملك قبل "
-"المواصلة."
 
-#: ../data/update-notifier.desktop.in.h:2
+#: ../data/update-notifier.desktop.in.h:1
 msgid "Update Notifier"
 msgstr "مشعر التحديثات"
 
-#: ../data/update-notifier.desktop.in.h:1
+#: ../data/update-notifier.desktop.in.h:2
 msgid "Check for available updates automatically"
 msgstr "التمس التحديثات تلقائيا"
 
 #. Name
-#: ../data/package-data-downloads-failed.in:1
+#: ../data/package-data-downloads-failed.in:2
 msgid "Failure to download extra data files"
 msgstr "فشل تنزيل ملفات البيانات الإضافية"
 
@@ -414,7 +392,7 @@ msgstr ""
 "تنفيذ هذا الأمر يتطلب اتصالا نشطا بالإنترنت."
 
 #. Name
-#: ../data/package-data-downloads-failed-permanently.in:1
+#: ../data/package-data-downloads-failed-permanently.in:2
 msgid "Data files for some packages could not be downloaded"
 msgstr "لا يمكن تنزيل ملفات البيانات لبعض الحزم"
 
@@ -427,3 +405,64 @@ msgid ""
 msgstr ""
 "هذا فشل دائم سيترك هذه الحزم غير صالحة للاستخدام على نظامك. قد تكون بحاجة "
 "لإصلاح اتصالك بالإنترنت، ثم أزِل وأعد تثبيت الحزم لإصلاح هذه المشكلة."
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Please enter your password to "
+#~ "access problem reports of system programs</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">من فضلك أدخل كلمة السر لتَنفُذ إلى "
+#~ "الإبلاغ عن أعطال برمجيات النظام</span>"
+
+#~ msgid "Addon volume detected"
+#~ msgstr "يوجد مجلد ملحقات"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">An addon volume with software "
+#~ "applications has been detected.</span>\n"
+#~ "\n"
+#~ "Would you like to view/install the content? "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">يوجد مجلد يحوي تطبيقات برمجية.</"
+#~ "span>\n"
+#~ "\n"
+#~ "أتريد استعراض أو تثبيت المحتويات؟ "
+
+#~ msgid "Start addon installer"
+#~ msgstr "ابدأ مثبت الملحقات"
+
+#~ msgid "System restart required"
+#~ msgstr "يجب  إعادة تشغيل النظام"
+
+#~ msgid ""
+#~ "To finish updating your system, please restart it.\n"
+#~ "\n"
+#~ "Click on the notification icon for details."
+#~ msgstr ""
+#~ "للإنتهاء من تحديث نظامك، رجاءاً أعد التشغيل.\n"
+#~ "\n"
+#~ "إضغط على أيقونة الإشعارات للتفاصيل."
+
+#~ msgid "Reboot failed"
+#~ msgstr "فشلت إعادة الإقلاع"
+
+#~ msgid "Failed to request reboot, please shutdown manually"
+#~ msgstr "فشل طلب إعادة الإقلاع، من فضلك أغلق الجهاز يدويا"
+
+#~ msgid "Internal error"
+#~ msgstr "عطل داخلي"
+
+#~ msgid "Restart Required"
+#~ msgstr "إعادة التشغيل مطلوبة"
+
+#~ msgid "Restart _Later"
+#~ msgstr "أعد التشغيل _لاحقا"
+
+#~ msgid "_Restart Now"
+#~ msgstr "أعد التشغيل اﻵ_ن"
+
+#~ msgid ""
+#~ "The computer needs to restart to finish installing updates. Please save "
+#~ "your work before continuing."
+#~ msgstr ""
+#~ "يحتاج الحاسوب لإعادة التشغيل لتطبيق التحديثات. من فضلك احفظ عملك قبل "
+#~ "المواصلة."
diff --git a/po/ast.po b/po/ast.po
index c317072..7dbda06 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-notifier\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-10 12:15+0100\n"
+"POT-Creation-Date: 2020-11-19 05:31+0000\n"
 "PO-Revision-Date: 2012-10-09 19:59+0000\n"
 "Last-Translator: Colin Watson <[e-mail]>\n"
 "Language-Team: Asturian <[e-mail]>\n"
+"Language: ast\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,43 +24,77 @@ msgstr ""
 msgid "Unknown Error: '%s' (%s)"
 msgstr "Fallu desconocíu: «%s» (%s)"
 
-#: ../data/apt_check.py:66
+#: ../data/apt_check.py:82
+msgid "UA Infra: Extended Security Maintenance (ESM) is enabled."
+msgstr ""
+
+#: ../data/apt_check.py:87
+msgid "UA Infra: Extended Security Maintenance (ESM) is not enabled."
+msgstr ""
+
+#: ../data/apt_check.py:93
 #, python-format
 msgid "%i package can be updated."
 msgid_plural "%i packages can be updated."
 msgstr[0] "%i paquete puede anovase."
 msgstr[1] "%i paquetes pueden anovase."
 
-#: ../data/apt_check.py:71
+#: ../data/apt_check.py:99
 #, python-format
-msgid "%i update is a security update."
-msgid_plural "%i updates are security updates."
+msgid "%i of these updates is fixed through UA Infra: ESM."
+msgid_plural "%i of these updates are fixed through UA Infra: ESM."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../data/apt_check.py:108
+#, fuzzy, python-format
+msgid "%i of these updates is a security update."
+msgid_plural "%i of these updates are security updates."
 msgstr[0] "l'anovamientu %i ye un anovamientu de seguridá."
 msgstr[1] "los anovamientos %i son anovamientos de seguridá"
 
-#: ../data/apt_check.py:97
+#: ../data/apt_check.py:117
+msgid "To see these additional updates run: apt list --upgradable"
+msgstr ""
+
+#: ../data/apt_check.py:124
+#, python-format
+msgid "Enable UA Infra: ESM to receive %i additional security update."
+msgid_plural "Enable UA Infra: ESM to receive %i additional security updates."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../data/apt_check.py:135
+msgid "Enable UA Infra: ESM to receive additional future security updates."
+msgstr ""
+
+#: ../data/apt_check.py:140
+msgid "See https://ubuntu.com/security/esm or run: sudo ua status"
+msgstr ""
+
+#: ../data/apt_check.py:181
 #, python-format
 msgid "Error: Opening the cache (%s)"
 msgstr "Fallu: Abriendo la caché (%s)"
 
-#: ../data/apt_check.py:111
+#: ../data/apt_check.py:191
 msgid "Error: BrokenCount > 0"
 msgstr "Fallu: BrokenCount > 0"
 
-#: ../data/apt_check.py:118
+#: ../data/apt_check.py:198
 #, python-format
 msgid "Error: Marking the upgrade (%s)"
 msgstr "Fallu: Marcando l'actualización (%s)"
 
-#: ../data/apt_check.py:182
+#: ../data/apt_check.py:304
 msgid "Show the packages that are going to be installed/upgraded"
 msgstr "Amuesa los paquetes que van ser instalaos o actualizaos"
 
-#: ../data/apt_check.py:187
+#: ../data/apt_check.py:309
 msgid "Show human readable output on stdout"
 msgstr "Amuesa una salida llexible pa humanos en stdout"
 
-#: ../data/apt_check.py:191
+#: ../data/apt_check.py:313
 msgid ""
 "Return the time in days when security updates are installed unattended (0 "
 "means disabled)"
@@ -67,31 +102,23 @@ msgstr ""
 "Devuelve'l tiempu en díes nel que los anovamientos de seguridá s'instalen de "
 "mou desatendíu (0 significa deshabilitáu)."
 
-#: ../src/crash.c:45
+#: ../src/crash.c:46
 msgid "System program problem detected"
 msgstr "Deteutóse un problema en programa de sistema"
 
-#: ../src/crash.c:46
+#: ../src/crash.c:47
 msgid "Do you want to report the problem now?"
 msgstr "¿Quies informar agora d'esti problema?"
 
-#: ../src/crash.c:56
+#: ../src/crash.c:57
 msgid "Report problem…"
 msgstr "Informar del problema..."
 
-#: ../src/crash.c:72
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Please enter your password to access "
-"problem reports of system programs</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Introduz la contraseña p'acceder a los "
-"informes de problemes de los programes del sistema</span>"
-
-#: ../src/crash.c:92 ../src/crash.c:218
+#: ../src/crash.c:95 ../src/crash.c:185
 msgid "Crash report detected"
 msgstr "Deteutóse un informe de fallu"
 
-#: ../src/crash.c:93
+#: ../src/crash.c:96
 msgid ""
 "An application has crashed on your system (now or in the past). Click on the "
 "notification icon to display details. "
@@ -100,11 +127,11 @@ msgstr ""
 "sobro l'iconu de notificación p'amosar más detais. "
 
 #. Create and show the notification
-#: ../src/avahi.c:15
+#: ../src/avahi.c:16
 msgid "Network service discovery disabled"
 msgstr "Serviciu d'autodeteición de rede deshabilitáu"
 
-#: ../src/avahi.c:16
+#: ../src/avahi.c:17
 msgid ""
 "Your current network has a .local domain, which is not recommended and "
 "incompatible with the Avahi network service discovery. The service has been "
@@ -113,11 +140,11 @@ msgstr ""
 "La so rede actual tien un dominiu .llocal. non recomendáu ya incompatible "
 "col serviciu d'autodeteición de rede Avahi. El serviciu foi deshabilitáu"
 
-#: ../src/gdu.c:53
+#: ../src/cdroms.c:48
 msgid "Software Packages Volume Detected"
 msgstr "Volume de paquetes de software deteutaos"
 
-#: ../src/gdu.c:54
+#: ../src/cdroms.c:49
 msgid ""
 "<span weight=\"bold\" size=\"larger\">A volume with software packages has "
 "been detected.</span>\n"
@@ -129,15 +156,15 @@ msgstr ""
 "\n"
 "¿Prestaría-y abrilu col xestor de paquetes?"
 
-#: ../src/gdu.c:62
+#: ../src/cdroms.c:57
 msgid "Start Package Manager"
 msgstr "Aniciar Xestor de paquetes"
 
-#: ../src/gdu.c:68
+#: ../src/cdroms.c:63
 msgid "Upgrade volume detected"
 msgstr "Deteutáu volume d'anovamientu"
 
-#: ../src/gdu.c:69
+#: ../src/cdroms.c:64
 msgid ""
 "<span weight=\"bold\" size=\"larger\">A distribution volume with software "
 "packages has been detected.</span>\n"
@@ -149,39 +176,15 @@ msgstr ""
 "\n"
 "¿Deseya intentar l'actualización dende ésti automáticamente? "
 
-#: ../src/gdu.c:76
+#: ../src/cdroms.c:71
 msgid "Run upgrade"
 msgstr "Actualizar"
 
-#: ../src/gdu.c:82
-msgid "Addon volume detected"
-msgstr "Discu suplementariu deteutáu"
-
-#: ../src/gdu.c:83
-msgid ""
-"<span weight=\"bold\" size=\"larger\">An addon volume with software "
-"applications has been detected.</span>\n"
-"\n"
-"Would you like to view/install the content? "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Tiense deteutáu un volume "
-"suplementariu con aplicaciones de software.</span>\n"
-"\n"
-"¿Prúye-y allupar/instalar el conteníu? "
-
-#: ../src/gdu.c:90 ../src/gdu.c:109
-msgid "Start package manager"
-msgstr "Aniciar xestor de paquetes"
-
-#: ../src/gdu.c:92
-msgid "Start addon installer"
-msgstr "Entamar l'instalador de suplementos"
-
-#: ../src/gdu.c:100
+#: ../src/cdroms.c:79
 msgid "APTonCD volume detected"
 msgstr "Deteutáu volume APTonCD"
 
-#: ../src/gdu.c:101
+#: ../src/cdroms.c:80
 msgid ""
 "<span weight=\"bold\" size=\"larger\">A volume with unofficial software "
 "packages has been detected.</span>\n"
@@ -193,70 +196,52 @@ msgstr ""
 "\n"
 "¿Deseya abrilu col xestor de paquetes?"
 
-#: ../src/hooks.c:346 ../ui/hooks-dialog.ui.h:2
+#: ../src/cdroms.c:88 ../src/update.c:39
+msgid "Start package manager"
+msgstr "Aniciar xestor de paquetes"
+
+#: ../src/hooks.c:362 ../ui/hooks-dialog.ui.h:2
 msgid "_Run this action now"
 msgstr "_Executar esta aición agora."
 
-#: ../src/hooks.c:418 ../src/hooks.c:545 ../src/hooks.c:875
+#: ../src/hooks.c:514 ../src/hooks.c:664
 msgid "Information available"
 msgstr "Información disponible"
 
-#: ../src/hooks.c:546
+#: ../src/hooks.c:665
 msgid "Click on the notification icon to show the available information.\n"
 msgstr ""
 "Calque sobro l'iconu de notificación p'amosar l'información disponible\n"
 
-#: ../src/reboot.c:29 ../src/reboot.c:277
-msgid "System restart required"
-msgstr "Ye necesario reaniciar el sistema"
-
-#: ../src/reboot.c:30
-msgid ""
-"To finish updating your system, please restart it.\n"
-"\n"
-"Click on the notification icon for details."
-msgstr ""
-"Pa finar l'anovamientu del sistema, reanícialu.\n"
-"\n"
-"Calca nel iconu de notificación pa obtener más información."
-
-#: ../src/reboot.c:104
-msgid "Reboot failed"
-msgstr "Falló'l reaniciu"
-
-#: ../src/reboot.c:105
-msgid "Failed to request reboot, please shutdown manually"
-msgstr "Falló'l reaniciu solicitáu; por favor, apague manualmente"
-
-#: ../src/update.c:27
+#: ../src/update.c:28
 msgid "Show updates"
 msgstr "Amosar actualizaciones"
 
-#: ../src/update.c:31
+#: ../src/update.c:32
 msgid "Install all updates"
 msgstr "Instalar toles actualizaciones"
 
-#: ../src/update.c:35
+#: ../src/update.c:36
 msgid "Check for updates"
 msgstr "Comprobar actualizaciones"
 
-#: ../src/update.c:80
+#: ../src/update.c:83
 #, c-format
 msgid "There is %i update available"
 msgid_plural "There are %i updates available"
 msgstr[0] "Hai %i actualización disponible"
 msgstr[1] "Hai %i actualizaciones disponibles"
 
-#: ../src/update.c:149
+#: ../src/update.c:147
 msgid "Show notifications"
 msgstr "Amosar notificaciones"
 
 #. and update the tooltip
-#: ../src/update.c:208
+#: ../src/update.c:203
 msgid "A package manager is working"
 msgstr "El xestor de paquetes ta trabayando"
 
-#: ../src/update.c:240
+#: ../src/update.c:235
 #, c-format
 msgid ""
 "There is %i update available. Click on the notification icon to show the "
@@ -271,23 +256,24 @@ msgstr[1] ""
 "Hai %i actualizaciones disponibles. Calca nel iconu de notificación p'amosar "
 "les actualizaciones disponibles."
 
-#: ../src/update.c:251
+#: ../src/update.c:246
 msgid "Software updates available"
 msgstr "Hai actualizaciones de software disponibles"
 
-#: ../src/update.c:287
+#: ../src/update.c:284
+#, fuzzy
 msgid ""
 "The update information is outdated. This may be caused by network problems "
 "or by a repository that is no longer available. Please update manually by "
-"clicking on this icon and then selecting 'Check for updates' and check if "
-"some of the listed repositories fail."
+"selecting 'Show updates' from the indicator menu, and watching for any "
+"failing repositories."
 msgstr ""
 "La información d'anovamientu ta caducada. Esto pue debese a problemes de "
 "rede o por qu'un depósitu yá nun tea disponible. Por favor anova manualmente "
 "calcando nesti iconu y depués seleiciona \"Guetar anovamientos\" y comprueba "
 "si dalgún de los depósitos llistaos falla."
 
-#: ../src/update.c:582
+#: ../src/update.c:574
 #, c-format
 msgid ""
 "An error occurred, please run Package Manager from the right-click menu or "
@@ -298,7 +284,7 @@ msgstr ""
 "drechu, o apt-get nun terminal, pa ver qué salió mal.\n"
 "El mensaxe d'error ye: '%s'. "
 
-#: ../src/update.c:589
+#: ../src/update.c:581
 msgid ""
 "An error occurred, please run Package Manager from the right-click menu or "
 "apt-get in a terminal to see what is wrong."
@@ -306,73 +292,55 @@ msgstr ""
 "Tien asocedío un error; por favor, execute el Xestor de paquetes dende'l "
 "menú contestual o apt-get nuna terminal p'adicar au ta'l problema."
 
-#: ../src/update.c:593
-msgid ""
-"This usually means that your installed packages have unmet dependencies"
+#: ../src/update.c:585
+msgid "This usually means that your installed packages have unmet dependencies"
 msgstr ""
 "Normalmente, esto quier dicir que tien instalao paquetes que tienen "
 "dependencies que nun se puen satisfacer."
 
-#: ../src/update.c:606
+#: ../src/update.c:598
 msgid "A problem occurred when checking for the updates."
 msgstr "Hebo un problema al comprobar les actualizaciones."
 
-#: ../src/update-notifier.c:402
-msgid "Internal error"
-msgstr "Error internu"
-
-#: ../src/update-notifier.c:570
+#: ../src/update-notifier.c:541
 msgid "- inform about updates"
 msgstr "- informar sobro los anovamientos"
 
-#: ../src/update-notifier.c:572
+#: ../src/update-notifier.c:543
 #, c-format
 msgid "Failed to init the UI: %s\n"
 msgstr "Falló al anicializar la interface d'usuariu: %s\n"
 
-#: ../src/update-notifier.c:573
+#: ../src/update-notifier.c:544
 msgid "unknown error"
 msgstr "fallu desconocíu"
 
-#: ../src/update-notifier.c:596
+#: ../src/update-notifier.c:569
 msgid "update-notifier"
 msgstr "notificador-d'anovamientos"
 
 #: ../ui/hooks-dialog.ui.h:1
 msgid "<span weight=\"bold\" size=\"larger\">Update information</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Información d'anovamientu</span>"
-
-#: ../ui/reboot-dialog.ui.h:1
-msgid "Restart Required"
-msgstr "Requierse reaniciar"
-
-#: ../ui/reboot-dialog.ui.h:2
-msgid "Restart _Later"
-msgstr "Reaniciar más _sero"
+msgstr "<span weight=\"bold\" size=\"larger\">Información d'anovamientu</span>"
 
-#: ../ui/reboot-dialog.ui.h:4
-msgid "_Restart Now"
-msgstr "_Reaniciar agora"
+#: ../data/com.ubuntu.update-notifier.policy.in.h:1
+msgid "Authentication is needed to upgrade"
+msgstr ""
 
-#: ../ui/reboot-dialog.ui.h:3
-msgid ""
-"The computer needs to restart to finish installing updates. Please save your "
-"work before continuing."
+#: ../data/com.ubuntu.update-notifier.policy.in.h:2
+msgid "Authentication is needed to query package system lock status"
 msgstr ""
-"L'equipu necesita reaniciase pa finar l'anovamientu. Guarde'l so trabayu "
-"enantes de continuar."
 
-#: ../data/update-notifier.desktop.in.h:2
+#: ../data/update-notifier.desktop.in.h:1
 msgid "Update Notifier"
 msgstr "Notificador d'anovamientos"
 
-#: ../data/update-notifier.desktop.in.h:1
+#: ../data/update-notifier.desktop.in.h:2
 msgid "Check for available updates automatically"
 msgstr "Comprobar automáticamente los anovamientos disponibles"
 
 #. Name
-#: ../data/package-data-downloads-failed.in:1
+#: ../data/package-data-downloads-failed.in:2
 msgid "Failure to download extra data files"
 msgstr "Fallu al descargar ficheros de datos estra"
 
@@ -403,7 +371,7 @@ msgstr ""
 "esta orde requier tener activa una conexón a Internet."
 
 #. Name
-#: ../data/package-data-downloads-failed-permanently.in:1
+#: ../data/package-data-downloads-failed-permanently.in:2
 msgid "Data files for some packages could not be downloaded"
 msgstr "Los ficheros de datos pa dalgunos paquetes nun pudieron descargase."
 
@@ -417,3 +385,64 @@ msgstr ""
 "Esti ye un fallu permanente que dexa estos paquetes inutilizables nel "
 "sistema. Pues necesitar configurar la to conexón a Internet, dempués "
 "desaniciar y reinstalar los paquetes pa iguar esti problema."
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Please enter your password to "
+#~ "access problem reports of system programs</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Introduz la contraseña p'acceder a "
+#~ "los informes de problemes de los programes del sistema</span>"
+
+#~ msgid "Addon volume detected"
+#~ msgstr "Discu suplementariu deteutáu"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">An addon volume with software "
+#~ "applications has been detected.</span>\n"
+#~ "\n"
+#~ "Would you like to view/install the content? "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Tiense deteutáu un volume "
+#~ "suplementariu con aplicaciones de software.</span>\n"
+#~ "\n"
+#~ "¿Prúye-y allupar/instalar el conteníu? "
+
+#~ msgid "Start addon installer"
+#~ msgstr "Entamar l'instalador de suplementos"
+
+#~ msgid "System restart required"
+#~ msgstr "Ye necesario reaniciar el sistema"
+
+#~ msgid ""
+#~ "To finish updating your system, please restart it.\n"
+#~ "\n"
+#~ "Click on the notification icon for details."
+#~ msgstr ""
+#~ "Pa finar l'anovamientu del sistema, reanícialu.\n"
+#~ "\n"
+#~ "Calca nel iconu de notificación pa obtener más información."
+
+#~ msgid "Reboot failed"
+#~ msgstr "Falló'l reaniciu"
+
+#~ msgid "Failed to request reboot, please shutdown manually"
+#~ msgstr "Falló'l reaniciu solicitáu; por favor, apague manualmente"
+
+#~ msgid "Internal error"
+#~ msgstr "Error internu"
+
+#~ msgid "Restart Required"
+#~ msgstr "Requierse reaniciar"
+
+#~ msgid "Restart _Later"
+#~ msgstr "Reaniciar más _sero"
+
+#~ msgid "_Restart Now"
+#~ msgstr "_Reaniciar agora"
+
+#~ msgid ""
+#~ "The computer needs to restart to finish installing updates. Please save "
+#~ "your work before continuing."
+#~ msgstr ""
+#~ "L'equipu necesita reaniciase pa finar l'anovamientu. Guarde'l so trabayu "
+#~ "enantes de continuar."
diff --git a/po/az.po b/po/az.po
index 2b84aaf..0110a9e 100644
--- a/po/az.po
+++ b/po/az.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: update-notifier\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-10 12:15+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-11-19 05:31+0000\n"
 "PO-Revision-Date: 2012-05-14 15:24+0000\n"
 "Last-Translator: Arzu Huseynov <[e-mail]>\n"
 "Language-Team: Azerbaijani <[e-mail]>\n"
+"Language: az\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,93 +24,121 @@ msgstr ""
 msgid "Unknown Error: '%s' (%s)"
 msgstr "Bilinməyən Yanlış: '%s' (%s)"
 
-#: ../data/apt_check.py:66
+#: ../data/apt_check.py:82
+msgid "UA Infra: Extended Security Maintenance (ESM) is enabled."
+msgstr ""
+
+#: ../data/apt_check.py:87
+msgid "UA Infra: Extended Security Maintenance (ESM) is not enabled."
+msgstr ""
+
+#: ../data/apt_check.py:93
 #, python-format
 msgid "%i package can be updated."
 msgid_plural "%i packages can be updated."
 msgstr[0] "%i paket yenilənə bilər."
 msgstr[1] "%i paketlər yenilənə bilər."
 
-#: ../data/apt_check.py:71
+#: ../data/apt_check.py:99
+#, python-format
+msgid "%i of these updates is fixed through UA Infra: ESM."
+msgid_plural "%i of these updates are fixed through UA Infra: ESM."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../data/apt_check.py:108
 #, python-format
-msgid "%i update is a security update."
-msgid_plural "%i updates are security updates."
+msgid "%i of these updates is a security update."
+msgid_plural "%i of these updates are security updates."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../data/apt_check.py:97
+#: ../data/apt_check.py:117
+msgid "To see these additional updates run: apt list --upgradable"
+msgstr ""
+
+#: ../data/apt_check.py:124
+#, python-format
+msgid "Enable UA Infra: ESM to receive %i additional security update."
+msgid_plural "Enable UA Infra: ESM to receive %i additional security updates."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../data/apt_check.py:135
+msgid "Enable UA Infra: ESM to receive additional future security updates."
+msgstr ""
+
+#: ../data/apt_check.py:140
+msgid "See https://ubuntu.com/security/esm or run: sudo ua status"
+msgstr ""
+
+#: ../data/apt_check.py:181
 #, python-format
 msgid "Error: Opening the cache (%s)"
 msgstr ""
 
-#: ../data/apt_check.py:111
+#: ../data/apt_check.py:191
 msgid "Error: BrokenCount > 0"
 msgstr ""
 
-#: ../data/apt_check.py:118
+#: ../data/apt_check.py:198
 #, python-format
 msgid "Error: Marking the upgrade (%s)"
 msgstr ""
 
-#: ../data/apt_check.py:182
+#: ../data/apt_check.py:304
 msgid "Show the packages that are going to be installed/upgraded"
 msgstr ""
 
-#: ../data/apt_check.py:187
+#: ../data/apt_check.py:309
 msgid "Show human readable output on stdout"
 msgstr ""
 
-#: ../data/apt_check.py:191
+#: ../data/apt_check.py:313
 msgid ""
 "Return the time in days when security updates are installed unattended (0 "
 "means disabled)"
 msgstr ""
 
-#: ../src/crash.c:45
+#: ../src/crash.c:46
 msgid "System program problem detected"
 msgstr ""
 
-#: ../src/crash.c:46
+#: ../src/crash.c:47
 msgid "Do you want to report the problem now?"
 msgstr ""
 
-#: ../src/crash.c:56
+#: ../src/crash.c:57
 msgid "Report problem…"
 msgstr ""
 
-#: ../src/crash.c:72
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Please enter your password to access "
-"problem reports of system programs</span>"
-msgstr ""
-
-#: ../src/crash.c:92 ../src/crash.c:218
+#: ../src/crash.c:95 ../src/crash.c:185
 msgid "Crash report detected"
 msgstr ""
 
-#: ../src/crash.c:93
+#: ../src/crash.c:96
 msgid ""
 "An application has crashed on your system (now or in the past). Click on the "
 "notification icon to display details. "
 msgstr ""
 
 #. Create and show the notification
-#: ../src/avahi.c:15
+#: ../src/avahi.c:16
 msgid "Network service discovery disabled"
 msgstr ""
 
-#: ../src/avahi.c:16
+#: ../src/avahi.c:17
 msgid ""
 "Your current network has a .local domain, which is not recommended and "
 "incompatible with the Avahi network service discovery. The service has been "
 "disabled."
 msgstr ""
 
-#: ../src/gdu.c:53
+#: ../src/cdroms.c:48
 msgid "Software Packages Volume Detected"
 msgstr ""
 
-#: ../src/gdu.c:54
+#: ../src/cdroms.c:49
 msgid ""
 "<span weight=\"bold\" size=\"larger\">A volume with software packages has "
 "been detected.</span>\n"
@@ -117,15 +146,15 @@ msgid ""
 "Would you like to open it with the package manager?"
 msgstr ""
 
-#: ../src/gdu.c:62
+#: ../src/cdroms.c:57
 msgid "Start Package Manager"
 msgstr ""
 
-#: ../src/gdu.c:68
+#: ../src/cdroms.c:63
 msgid "Upgrade volume detected"
 msgstr ""
 
-#: ../src/gdu.c:69
+#: ../src/cdroms.c:64
 msgid ""
 "<span weight=\"bold\" size=\"larger\">A distribution volume with software "
 "packages has been detected.</span>\n"
@@ -133,35 +162,15 @@ msgid ""
 "Would you like to try to upgrade from it automatically? "
 msgstr ""
 
-#: ../src/gdu.c:76
+#: ../src/cdroms.c:71
 msgid "Run upgrade"
 msgstr ""
 
-#: ../src/gdu.c:82
-msgid "Addon volume detected"
-msgstr ""
-
-#: ../src/gdu.c:83
-msgid ""
-"<span weight=\"bold\" size=\"larger\">An addon volume with software "
-"applications has been detected.</span>\n"
-"\n"
-"Would you like to view/install the content? "
-msgstr ""
-
-#: ../src/gdu.c:90 ../src/gdu.c:109
-msgid "Start package manager"
-msgstr "Paket idarəçisini başlat"
-
-#: ../src/gdu.c:92
-msgid "Start addon installer"
-msgstr ""
-
-#: ../src/gdu.c:100
+#: ../src/cdroms.c:79
 msgid "APTonCD volume detected"
 msgstr ""
 
-#: ../src/gdu.c:101
+#: ../src/cdroms.c:80
 msgid ""
 "<span weight=\"bold\" size=\"larger\">A volume with unofficial software "
 "packages has been detected.</span>\n"
@@ -169,66 +178,51 @@ msgid ""
 "Would you like to open it with the package manager?"
 msgstr ""
 
-#: ../src/hooks.c:346 ../ui/hooks-dialog.ui.h:2
+#: ../src/cdroms.c:88 ../src/update.c:39
+msgid "Start package manager"
+msgstr "Paket idarəçisini başlat"
+
+#: ../src/hooks.c:362 ../ui/hooks-dialog.ui.h:2
 msgid "_Run this action now"
 msgstr "Bu əməliyyatı indi _icra et"
 
-#: ../src/hooks.c:418 ../src/hooks.c:545 ../src/hooks.c:875
+#: ../src/hooks.c:514 ../src/hooks.c:664
 msgid "Information available"
 msgstr ""
 
-#: ../src/hooks.c:546
+#: ../src/hooks.c:665
 msgid "Click on the notification icon to show the available information.\n"
 msgstr "Mövcud məlumatın göstərilməsi üçün, bildiriş şəkilciyinə basın.\n"
 
-#: ../src/reboot.c:29 ../src/reboot.c:277
-msgid "System restart required"
-msgstr "Sistemin yenidən başlaması mütləqdir"
-
-#: ../src/reboot.c:30
-msgid ""
-"To finish updating your system, please restart it.\n"
-"\n"
-"Click on the notification icon for details."
-msgstr ""
-
-#: ../src/reboot.c:104
-msgid "Reboot failed"
-msgstr ""
-
-#: ../src/reboot.c:105
-msgid "Failed to request reboot, please shutdown manually"
-msgstr ""
-
-#: ../src/update.c:27
+#: ../src/update.c:28
 msgid "Show updates"
 msgstr "Yeniləmələri göstər"
 
-#: ../src/update.c:31
+#: ../src/update.c:32
 msgid "Install all updates"
 msgstr "Bütün yeniləmələri qur"
 
-#: ../src/update.c:35
+#: ../src/update.c:36
 msgid "Check for updates"
 msgstr "Yeniləmələrin mövcudluğunu yoxla"
 
-#: ../src/update.c:80
+#: ../src/update.c:83
 #, c-format
 msgid "There is %i update available"
 msgid_plural "There are %i updates available"
 msgstr[0] "%i yeniləmə mövcuddur"
 msgstr[1] "%i yeniləmə mövcuddur"
 
-#: ../src/update.c:149
+#: ../src/update.c:147
 msgid "Show notifications"
 msgstr "Bildirişləri göstər"
 
 #. and update the tooltip
-#: ../src/update.c:208
+#: ../src/update.c:203
 msgid "A package manager is working"
 msgstr "Paket meneceri işləyir"
 
-#: ../src/update.c:240
+#: ../src/update.c:235
 #, c-format
 msgid ""
 "There is %i update available. Click on the notification icon to show the "
@@ -239,19 +233,19 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/update.c:251
+#: ../src/update.c:246
 msgid "Software updates available"
 msgstr "Proqram təminatı yeniləmələri mövcuddur"
 
-#: ../src/update.c:287
+#: ../src/update.c:284
 msgid ""
 "The update information is outdated. This may be caused by network problems "
 "or by a repository that is no longer available. Please update manually by "
-"clicking on this icon and then selecting 'Check for updates' and check if "
-"some of the listed repositories fail."
+"selecting 'Show updates' from the indicator menu, and watching for any "
+"failing repositories."
 msgstr ""
 
-#: ../src/update.c:582
+#: ../src/update.c:574
 #, c-format
 msgid ""
 "An error occurred, please run Package Manager from the right-click menu or "
@@ -259,41 +253,36 @@ msgid ""
 "The error message was: '%s'. "
 msgstr ""
 
-#: ../src/update.c:589
+#: ../src/update.c:581
 msgid ""
 "An error occurred, please run Package Manager from the right-click menu or "
 "apt-get in a terminal to see what is wrong."
 msgstr ""
 
-#: ../src/update.c:593
-msgid ""
-"This usually means that your installed packages have unmet dependencies"
+#: ../src/update.c:585
+msgid "This usually means that your installed packages have unmet dependencies"
 msgstr ""
 "Adətən bu o deməkdir ki, qurulmuş paketlərin asılılıqları ilə əlaqədar "
 "problemlər var"
 
-#: ../src/update.c:606
+#: ../src/update.c:598
 msgid "A problem occurred when checking for the updates."
 msgstr ""
 
-#: ../src/update-notifier.c:402
-msgid "Internal error"
-msgstr "Daxili xəta"
-
-#: ../src/update-notifier.c:570
+#: ../src/update-notifier.c:541
 msgid "- inform about updates"
 msgstr ""
 
-#: ../src/update-notifier.c:572
+#: ../src/update-notifier.c:543
 #, c-format
 msgid "Failed to init the UI: %s\n"
 msgstr ""
 
-#: ../src/update-notifier.c:573
+#: ../src/update-notifier.c:544
 msgid "unknown error"
 msgstr ""
 
-#: ../src/update-notifier.c:596
+#: ../src/update-notifier.c:569
 msgid "update-notifier"
 msgstr ""
 
@@ -301,34 +290,24 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">Update information</span>"
 msgstr ""
 
-#: ../ui/reboot-dialog.ui.h:1
-msgid "Restart Required"
+#: ../data/com.ubuntu.update-notifier.policy.in.h:1
+msgid "Authentication is needed to upgrade"
 msgstr ""
 
-#: ../ui/reboot-dialog.ui.h:2
-msgid "Restart _Later"
-msgstr "_Birazdan sistemi yenidən başlad"
-
-#: ../ui/reboot-dialog.ui.h:4
-msgid "_Restart Now"
-msgstr "İndi _yenidən başlad"
-
-#: ../ui/reboot-dialog.ui.h:3
-msgid ""
-"The computer needs to restart to finish installing updates. Please save your "
-"work before continuing."
+#: ../data/com.ubuntu.update-notifier.policy.in.h:2
+msgid "Authentication is needed to query package system lock status"
 msgstr ""
 
-#: ../data/update-notifier.desktop.in.h:2
+#: ../data/update-notifier.desktop.in.h:1
 msgid "Update Notifier"
 msgstr ""
 
-#: ../data/update-notifier.desktop.in.h:1
+#: ../data/update-notifier.desktop.in.h:2
 msgid "Check for available updates automatically"
 msgstr ""
 
 #. Name
-#: ../data/package-data-downloads-failed.in:1
+#: ../data/package-data-downloads-failed.in:2
 msgid "Failure to download extra data files"
 msgstr ""
 
@@ -354,7 +333,7 @@ msgid ""
 msgstr ""
 
 #. Name
-#: ../data/package-data-downloads-failed-permanently.in:1
+#: ../data/package-data-downloads-failed-permanently.in:2
 msgid "Data files for some packages could not be downloaded"
 msgstr ""
 
@@ -365,3 +344,15 @@ msgid ""
 "system.  You may need to fix your Internet connection, then remove and "
 "reinstall the packages to fix this problem."
 msgstr ""
+
+#~ msgid "System restart required"
+#~ msgstr "Sistemin yenidən başlaması mütləqdir"
+
+#~ msgid "Internal error"
+#~ msgstr "Daxili xəta"
+
+#~ msgid "Restart _Later"
+#~ msgstr "_Birazdan sistemi yenidən başlad"
+
+#~ msgid "_Restart Now"
+#~ msgstr "İndi _yenidən başlad"
diff --git a/po/be.po b/po/be.po
index a44837d..3e45c36 100644
--- a/po/be.po
+++ b/po/be.po
@@ -7,15 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-notifier\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-10 12:15+0100\n"
+"POT-Creation-Date: 2020-11-19 05:31+0000\n"
 "PO-Revision-Date: 2011-10-10 07:18+0000\n"
 "Last-Translator: Maksim Tomkowicz <[e-mail]>\n"
 "Language-Team: Belarusian <[e-mail]>\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"
+"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-Launchpad-Export-Date: 2013-10-04 08:36+0000\n"
 "X-Generator: Launchpad (build 16791)\n"
 
@@ -24,7 +25,15 @@ msgstr ""
 msgid "Unknown Error: '%s' (%s)"
 msgstr "Невядомая памылка: '%s' (%s)"
 
-#: ../data/apt_check.py:66
+#: ../data/apt_check.py:82
+msgid "UA Infra: Extended Security Maintenance (ESM) is enabled."
+msgstr ""
+
+#: ../data/apt_check.py:87
+msgid "UA Infra: Extended Security Maintenance (ESM) is not enabled."
+msgstr ""
+
+#: ../data/apt_check.py:93
 #, python-format
 msgid "%i package can be updated."
 msgid_plural "%i packages can be updated."
@@ -32,37 +41,65 @@ msgstr[0] "ёсьць абнаўленьні для %i пакунка."
 msgstr[1] "ёсьць абнаўленьні для %i пакункаў."
 msgstr[2] "ёсьць абнаўленьні для %i пакункаў."
 
-#: ../data/apt_check.py:71
+#: ../data/apt_check.py:99
 #, python-format
-msgid "%i update is a security update."
-msgid_plural "%i updates are security updates."
+msgid "%i of these updates is fixed through UA Infra: ESM."
+msgid_plural "%i of these updates are fixed through UA Infra: ESM."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../data/apt_check.py:108
+#, fuzzy, python-format
+msgid "%i of these updates is a security update."
+msgid_plural "%i of these updates are security updates."
 msgstr[0] "%i абнаўленьне з'яўляецца абнаўленьнем бясьпекі."
 msgstr[1] "%i абнаўленьні з'яўляюцца абнаўленьнямі бясьпекі."
 msgstr[2] "%i абнаўленьняў з'яўляюцца абнаўленьнямі бясьпекі."
 
-#: ../data/apt_check.py:97
+#: ../data/apt_check.py:117
+msgid "To see these additional updates run: apt list --upgradable"
+msgstr ""
+
+#: ../data/apt_check.py:124
+#, python-format
+msgid "Enable UA Infra: ESM to receive %i additional security update."
+msgid_plural "Enable UA Infra: ESM to receive %i additional security updates."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../data/apt_check.py:135
+msgid "Enable UA Infra: ESM to receive additional future security updates."
+msgstr ""
+
+#: ../data/apt_check.py:140
+msgid "See https://ubuntu.com/security/esm or run: sudo ua status"
+msgstr ""
+
+#: ../data/apt_check.py:181
 #, python-format
 msgid "Error: Opening the cache (%s)"
 msgstr "Памылка: адкрыцьцё кэша (%s)"
 
-#: ../data/apt_check.py:111
+#: ../data/apt_check.py:191
 msgid "Error: BrokenCount > 0"
 msgstr "Памылка: BrokenCount > 0"
 
-#: ../data/apt_check.py:118
+#: ../data/apt_check.py:198
 #, python-format
 msgid "Error: Marking the upgrade (%s)"
 msgstr "Памылка: адзначэньне абнаўленьня (%s)"
 
-#: ../data/apt_check.py:182
+#: ../data/apt_check.py:304
 msgid "Show the packages that are going to be installed/upgraded"
 msgstr "Пакункі, якія будуць усталяваны ці абноўлены"
 
-#: ../data/apt_check.py:187
+#: ../data/apt_check.py:309
 msgid "Show human readable output on stdout"
 msgstr "Выводзіць чытабельныя паведамленьні ў stdout"
 
-#: ../data/apt_check.py:191
+#: ../data/apt_check.py:313
 msgid ""
 "Return the time in days when security updates are installed unattended (0 "
 "means disabled)"
@@ -70,31 +107,23 @@ msgstr ""
 "Вяртае колькасьць дзён, калі былі аўтаматычна ўсталяваныя абнаўленьні "
 "бясьпекі (0 - выключана)"
 
-#: ../src/crash.c:45
+#: ../src/crash.c:46
 msgid "System program problem detected"
 msgstr "Знойдзена праблема ў сістэмнае праграме"
 
-#: ../src/crash.c:46
+#: ../src/crash.c:47
 msgid "Do you want to report the problem now?"
 msgstr "Ці жадаеце зараз паведаміць пра памылку?"
 
-#: ../src/crash.c:56
+#: ../src/crash.c:57
 msgid "Report problem…"
 msgstr "Справаздача пра памылку..."
 
-#: ../src/crash.c:72
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Please enter your password to access "
-"problem reports of system programs</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Калі ласка, увядзіце ваш пароль, каб "
-"атрымаць доступ да паведамленьняў пра праблемы ў сыстэмных праграмах</span>"
-
-#: ../src/crash.c:92 ../src/crash.c:218
+#: ../src/crash.c:95 ../src/crash.c:185
 msgid "Crash report detected"
 msgstr "Знойдзена справаздача аб аварыі ў праграме"
 
-#: ../src/crash.c:93
+#: ../src/crash.c:96
 msgid ""
 "An application has crashed on your system (now or in the past). Click on the "
 "notification icon to display details. "
@@ -103,11 +132,11 @@ msgstr ""
 "зараз). Пстрыкніце на значцы нагадваньня, каб убачыць падрабязнасьці. "
 
 #. Create and show the notification
-#: ../src/avahi.c:15
+#: ../src/avahi.c:16
 msgid "Network service discovery disabled"
 msgstr "Служба дасьледваньня сеткі адключана"
 
-#: ../src/avahi.c:16
+#: ../src/avahi.c:17
 msgid ""
 "Your current network has a .local domain, which is not recommended and "
 "incompatible with the Avahi network service discovery. The service has been "
@@ -116,11 +145,11 @@ msgstr ""
 "Ваша бягучая сетка мае дамэн .local, які не рэкамэндаваны і несумяшчальны са "
 "службай дасьледваньня сеткі Avahi. Гэтая служба была адключана."
 
-#: ../src/gdu.c:53
+#: ../src/cdroms.c:48
 msgid "Software Packages Volume Detected"
 msgstr "Знойдзены том з пакункамі праграмнага забесьпячэньня"
 
-#: ../src/gdu.c:54
+#: ../src/cdroms.c:49
 msgid ""
 "<span weight=\"bold\" size=\"larger\">A volume with software packages has "
 "been detected.</span>\n"
@@ -132,15 +161,15 @@ msgstr ""
 "\n"
 "Ці жадаеце адкрыць яго ў кіраўніку пакетаў?"
 
-#: ../src/gdu.c:62
+#: ../src/cdroms.c:57
 msgid "Start Package Manager"
 msgstr "Запусьціць Кіраўнік пакетаў"
 
-#: ../src/gdu.c:68
+#: ../src/cdroms.c:63
 msgid "Upgrade volume detected"
 msgstr "Знойдзены том з абнаўленьнямі"
 
-#: ../src/gdu.c:69
+#: ../src/cdroms.c:64
 msgid ""
 "<span weight=\"bold\" size=\"larger\">A distribution volume with software "
 "packages has been detected.</span>\n"
@@ -152,98 +181,55 @@ msgstr ""
 "\n"
 "Ці жадаеце паспрабаваць абнавіцца зь яго аўтаматычна? "
 
-#: ../src/gdu.c:76
+#: ../src/cdroms.c:71
 msgid "Run upgrade"
 msgstr "Запусьціць абнаўленьне"
 
-#: ../src/gdu.c:82
-msgid "Addon volume detected"
-msgstr "Знойдзены дадатковы носьбіт"
-
-#: ../src/gdu.c:83
-msgid ""
-"<span weight=\"bold\" size=\"larger\">An addon volume with software "
-"applications has been detected.</span>\n"
-"\n"
-"Would you like to view/install the content? "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Знойдзены том з дадатковымі "
-"праграмамі.</span>\n"
-"\n"
-"Ці жадаеце ўбачыць/усталяваць яго зьмест? "
-
-#: ../src/gdu.c:90 ../src/gdu.c:109
-msgid "Start package manager"
-msgstr "Запусьціць кіраўнік пакетаў"
-
-#: ../src/gdu.c:92
-msgid "Start addon installer"
-msgstr "Запусьціць дадатковую ўсталёўку"
-
-#: ../src/gdu.c:100
+#: ../src/cdroms.c:79
 msgid "APTonCD volume detected"
 msgstr "Знойдзены том APTonCD"
 
-#: ../src/gdu.c:101
+#: ../src/cdroms.c:80
 msgid ""
 "<span weight=\"bold\" size=\"larger\">A volume with unofficial software "
 "packages has been detected.</span>\n"
 "\n"
 "Would you like to open it with the package manager?"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Знойдзены том з неафіцыйнымі "
-"пакетамі.</span>\n"
+"<span weight=\"bold\" size=\"larger\">Знойдзены том з неафіцыйнымі пакетамі."
+"</span>\n"
 "\n"
 "Ці жадаеце адкрыць яго ў кіраўніку пакетаў?"
 
-#: ../src/hooks.c:346 ../ui/hooks-dialog.ui.h:2
+#: ../src/cdroms.c:88 ../src/update.c:39
+msgid "Start package manager"
+msgstr "Запусьціць кіраўнік пакетаў"
+
+#: ../src/hooks.c:362 ../ui/hooks-dialog.ui.h:2
 msgid "_Run this action now"
 msgstr "_Выканаць зараз"
 
-#: ../src/hooks.c:418 ../src/hooks.c:545 ../src/hooks.c:875
+#: ../src/hooks.c:514 ../src/hooks.c:664
 msgid "Information available"
 msgstr "У наяўнасьці ёсьць зьвесткі"
 
-#: ../src/hooks.c:546
+#: ../src/hooks.c:665
 msgid "Click on the notification icon to show the available information.\n"
 msgstr "Пстрыкніце па значцы інфармавальніка, каб убачыць наяўныя зьвесткі\n"
 
-#: ../src/reboot.c:29 ../src/reboot.c:277
-msgid "System restart required"
-msgstr "Патрэбны перазапуск сыстэмы"
-
-#: ../src/reboot.c:30
-msgid ""
-"To finish updating your system, please restart it.\n"
-"\n"
-"Click on the notification icon for details."
-msgstr ""
-"Абнаўленьне сыстэмы скончылася. Калі ласка, перазапусьціце кампутар.\n"
-"\n"
-"Клікніце па іконцы апавяшчэньня для больш дэтальнай інфармацыі."
-
-#: ../src/reboot.c:104
-msgid "Reboot failed"
-msgstr "Перазагрузка схібіла"
-
-#: ../src/reboot.c:105
-msgid "Failed to request reboot, please shutdown manually"
-msgstr ""
-"Збой запыту перазагрузкі. Калі ласка, самастойна перазагрузіце сыстэму"
-
-#: ../src/update.c:27
+#: ../src/update.c:28
 msgid "Show updates"
 msgstr "Паказаць абнаўленьні"
 
-#: ../src/update.c:31
+#: ../src/update.c:32
 msgid "Install all updates"
 msgstr "Усталяваць усе абнаўленьні"
 
-#: ../src/update.c:35
+#: ../src/update.c:36
 msgid "Check for updates"
 msgstr "Праверыць наяўнасьць абнаўленьняў"
 
-#: ../src/update.c:80
+#: ../src/update.c:83
 #, c-format
 msgid "There is %i update available"
 msgid_plural "There are %i updates available"
@@ -251,16 +237,16 @@ msgstr[0] "Ёсць у наяўнасьці %i абнаўленьне"
 msgstr[1] "Ёсць у наяўнасьці %i абнаўленьні"
 msgstr[2] "Ёсць у наяўнасьці %i абнаўленьняў"
 
-#: ../src/update.c:149
+#: ../src/update.c:147
 msgid "Show notifications"
 msgstr "Паказаць зьвесткі пра абнаўленьні"
 
 #. and update the tooltip
-#: ../src/update.c:208
+#: ../src/update.c:203
 msgid "A package manager is working"
 msgstr "Кіраўнік пакетаў ўжо працуе"
 
-#: ../src/update.c:240
+#: ../src/update.c:235
 #, c-format
 msgid ""
 "There is %i update available. Click on the notification icon to show the "
@@ -278,23 +264,24 @@ msgstr[2] ""
 "Даступна %i абнаўленьняў. Націсьніце на значак у прасторы паведамленьняў, "
 "каб прагледзець даступныя абнаўленьні."
 
-#: ../src/update.c:251
+#: ../src/update.c:246
 msgid "Software updates available"
 msgstr "У наяўнасьці маюцца абнаўленьні"
 
-#: ../src/update.c:287
+#: ../src/update.c:284
+#, fuzzy
 msgid ""
 "The update information is outdated. This may be caused by network problems "
 "or by a repository that is no longer available. Please update manually by "
-"clicking on this icon and then selecting 'Check for updates' and check if "
-"some of the listed repositories fail."
+"selecting 'Show updates' from the indicator menu, and watching for any "
+"failing repositories."
 msgstr ""
 "Інфармацыя аб абнаўленьнях састарэла. Гэта можа быць выклікана праблемамі з "
 "далучэньнем да сеткі, альбо рэпазіторый больш недаступны. Калі ласка, "
 "правядзіце абнаўленьне ўручную, клікнушы па гэтай іконке і выбраўшы "
 "«Праверыць абнаўленьне» і ўпэўніцеся, што рэпазіторыі датыкальны."
 
-#: ../src/update.c:582
+#: ../src/update.c:574
 #, c-format
 msgid ""
 "An error occurred, please run Package Manager from the right-click menu or "
@@ -305,7 +292,7 @@ msgstr ""
 "выканацйце у кансолі apt-get, каб даведацца больш.\n"
 "Тэкст паведамлення: \"%s\". "
 
-#: ../src/update.c:589
+#: ../src/update.c:581
 msgid ""
 "An error occurred, please run Package Manager from the right-click menu or "
 "apt-get in a terminal to see what is wrong."
@@ -313,72 +300,54 @@ msgstr ""
 "Узьнікла памылка. Калі ласка, запусьціце Кіраўнік пакетаў праз правую кнопку "
 "мышы альбо apt-get у тэрмінале, каб убачыць што здарылася."
 
-#: ../src/update.c:593
-msgid ""
-"This usually means that your installed packages have unmet dependencies"
+#: ../src/update.c:585
+msgid "This usually means that your installed packages have unmet dependencies"
 msgstr ""
 "Звычайна, гэта азначае што вы ўсталявале пакеты, якія недарэчныя залежнасьці"
 
-#: ../src/update.c:606
+#: ../src/update.c:598
 msgid "A problem occurred when checking for the updates."
 msgstr "Узьнікла праблема ў час праверкі абнаўленьняў."
 
-#: ../src/update-notifier.c:402
-msgid "Internal error"
-msgstr "Унутраная памылка"
-
-#: ../src/update-notifier.c:570
+#: ../src/update-notifier.c:541
 msgid "- inform about updates"
 msgstr "- інфармуе пра абнаўленьні"
 
-#: ../src/update-notifier.c:572
+#: ../src/update-notifier.c:543
 #, c-format
 msgid "Failed to init the UI: %s\n"
 msgstr "Немагчыма ініцыялізаваць UI: %s\n"
 
-#: ../src/update-notifier.c:573
+#: ../src/update-notifier.c:544
 msgid "unknown error"
 msgstr "невядомая памылка"
 
-#: ../src/update-notifier.c:596
+#: ../src/update-notifier.c:569
 msgid "update-notifier"
 msgstr "нагадвальнік-аб-абнаўленьнях"
 
 #: ../ui/hooks-dialog.ui.h:1
 msgid "<span weight=\"bold\" size=\"larger\">Update information</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Зьвесткі пра абнаўленьне</span>"
-
-#: ../ui/reboot-dialog.ui.h:1
-msgid "Restart Required"
-msgstr "Патрабуецца перазапуск"
-
-#: ../ui/reboot-dialog.ui.h:2
-msgid "Restart _Later"
-msgstr "Перазагрузіць _потым"
+msgstr "<span weight=\"bold\" size=\"larger\">Зьвесткі пра абнаўленьне</span>"
 
-#: ../ui/reboot-dialog.ui.h:4
-msgid "_Restart Now"
-msgstr "Перазагрузіць _зараз"
+#: ../data/com.ubuntu.update-notifier.policy.in.h:1
+msgid "Authentication is needed to upgrade"
+msgstr ""
 
-#: ../ui/reboot-dialog.ui.h:3
-msgid ""
-"The computer needs to restart to finish installing updates. Please save your "
-"work before continuing."
+#: ../data/com.ubuntu.update-notifier.policy.in.h:2
+msgid "Authentication is needed to query package system lock status"
 msgstr ""
-"Кампутар неабходна перазапусьціць, каб скончыць устаноўку абнаўленьняў. Калі "
-"ласка, захавайце вашую працу, перш чым працягваць."
 
-#: ../data/update-notifier.desktop.in.h:2
+#: ../data/update-notifier.desktop.in.h:1
 msgid "Update Notifier"
 msgstr "Паведамляльнік абнаўленьняў"
 
-#: ../data/update-notifier.desktop.in.h:1
+#: ../data/update-notifier.desktop.in.h:2
 msgid "Check for available updates automatically"
 msgstr "Правяраць на даступнасьць абнаўленьняў аўтаматычна"
 
 #. Name
-#: ../data/package-data-downloads-failed.in:1
+#: ../data/package-data-downloads-failed.in:2
 msgid "Failure to download extra data files"
 msgstr ""
 
@@ -404,7 +373,7 @@ msgid ""
 msgstr ""
 
 #. Name
-#: ../data/package-data-downloads-failed-permanently.in:1
+#: ../data/package-data-downloads-failed-permanently.in:2
 msgid "Data files for some packages could not be downloaded"
 msgstr ""
 
@@ -415,3 +384,66 @@ msgid ""
 "system.  You may need to fix your Internet connection, then remove and "
 "reinstall the packages to fix this problem."
 msgstr ""
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Please enter your password to "
+#~ "access problem reports of system programs</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Калі ласка, увядзіце ваш пароль, "
+#~ "каб атрымаць доступ да паведамленьняў пра праблемы ў сыстэмных праграмах</"
+#~ "span>"
+
+#~ msgid "Addon volume detected"
+#~ msgstr "Знойдзены дадатковы носьбіт"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">An addon volume with software "
+#~ "applications has been detected.</span>\n"
+#~ "\n"
+#~ "Would you like to view/install the content? "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Знойдзены том з дадатковымі "
+#~ "праграмамі.</span>\n"
+#~ "\n"
+#~ "Ці жадаеце ўбачыць/усталяваць яго зьмест? "
+
+#~ msgid "Start addon installer"
+#~ msgstr "Запусьціць дадатковую ўсталёўку"
+
+#~ msgid "System restart required"
+#~ msgstr "Патрэбны перазапуск сыстэмы"
+
+#~ msgid ""
+#~ "To finish updating your system, please restart it.\n"
+#~ "\n"
+#~ "Click on the notification icon for details."
+#~ msgstr ""
+#~ "Абнаўленьне сыстэмы скончылася. Калі ласка, перазапусьціце кампутар.\n"
+#~ "\n"
+#~ "Клікніце па іконцы апавяшчэньня для больш дэтальнай інфармацыі."
+
+#~ msgid "Reboot failed"
+#~ msgstr "Перазагрузка схібіла"
+
+#~ msgid "Failed to request reboot, please shutdown manually"
+#~ msgstr ""
+#~ "Збой запыту перазагрузкі. Калі ласка, самастойна перазагрузіце сыстэму"
+
+#~ msgid "Internal error"
+#~ msgstr "Унутраная памылка"
+
+#~ msgid "Restart Required"
+#~ msgstr "Патрабуецца перазапуск"
+
+#~ msgid "Restart _Later"
+#~ msgstr "Перазагрузіць _потым"
+
+#~ msgid "_Restart Now"
+#~ msgstr "Перазагрузіць _зараз"
+
+#~ msgid ""
+#~ "The computer needs to restart to finish installing updates. Please save "
+#~ "your work before continuing."
+#~ msgstr ""
+#~ "Кампутар неабходна перазапусьціць, каб скончыць устаноўку абнаўленьняў. "
+#~ "Калі ласка, захавайце вашую працу, перш чым працягваць."
diff --git a/po/bem.po b/po/bem.po
index e94330f..eb6e813 100644
--- a/po/bem.po
+++ b/po/bem.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: update-notifier\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-10 12:15+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-11-19 05:31+0000\n"
 "PO-Revision-Date: 2011-05-10 13:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bemba <[e-mail]>\n"
+"Language: bem\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,93 +24,121 @@ msgstr ""
 msgid "Unknown Error: '%s' (%s)"
 msgstr ""
 
-#: ../data/apt_check.py:66
+#: ../data/apt_check.py:82
+msgid "UA Infra: Extended Security Maintenance (ESM) is enabled."
+msgstr ""
+
+#: ../data/apt_check.py:87
+msgid "UA Infra: Extended Security Maintenance (ESM) is not enabled."
+msgstr ""
+
+#: ../data/apt_check.py:93
 #, python-format
 msgid "%i package can be updated."
 msgid_plural "%i packages can be updated."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../data/apt_check.py:71
+#: ../data/apt_check.py:99
+#, python-format
+msgid "%i of these updates is fixed through UA Infra: ESM."
+msgid_plural "%i of these updates are fixed through UA Infra: ESM."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../data/apt_check.py:108
 #, python-format
-msgid "%i update is a security update."
-msgid_plural "%i updates are security updates."
+msgid "%i of these updates is a security update."
+msgid_plural "%i of these updates are security updates."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../data/apt_check.py:97
+#: ../data/apt_check.py:117
+msgid "To see these additional updates run: apt list --upgradable"
+msgstr ""
+
+#: ../data/apt_check.py:124
+#, python-format
+msgid "Enable UA Infra: ESM to receive %i additional security update."
+msgid_plural "Enable UA Infra: ESM to receive %i additional security updates."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../data/apt_check.py:135
+msgid "Enable UA Infra: ESM to receive additional future security updates."
+msgstr ""
+
+#: ../data/apt_check.py:140
+msgid "See https://ubuntu.com/security/esm or run: sudo ua status"
+msgstr ""
+
+#: ../data/apt_check.py:181
 #, python-format
 msgid "Error: Opening the cache (%s)"
 msgstr ""
 
-#: ../data/apt_check.py:111
+#: ../data/apt_check.py:191
 msgid "Error: BrokenCount > 0"
 msgstr ""
 
-#: ../data/apt_check.py:118
+#: ../data/apt_check.py:198
 #, python-format
 msgid "Error: Marking the upgrade (%s)"
 msgstr ""
 
-#: ../data/apt_check.py:182
+#: ../data/apt_check.py:304
 msgid "Show the packages that are going to be installed/upgraded"
 msgstr ""
 
-#: ../data/apt_check.py:187
+#: ../data/apt_check.py:309
 msgid "Show human readable output on stdout"
 msgstr ""
 
-#: ../data/apt_check.py:191
+#: ../data/apt_check.py:313
 msgid ""
 "Return the time in days when security updates are installed unattended (0 "
 "means disabled)"
 msgstr ""
 
-#: ../src/crash.c:45
+#: ../src/crash.c:46
 msgid "System program problem detected"
 msgstr ""
 
-#: ../src/crash.c:46
+#: ../src/crash.c:47
 msgid "Do you want to report the problem now?"
 msgstr ""
 
-#: ../src/crash.c:56
+#: ../src/crash.c:57
 msgid "Report problem…"
 msgstr ""
 
-#: ../src/crash.c:72
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Please enter your password to access "
-"problem reports of system programs</span>"
-msgstr ""
-
-#: ../src/crash.c:92 ../src/crash.c:218
+#: ../src/crash.c:95 ../src/crash.c:185
 msgid "Crash report detected"
 msgstr ""
 
-#: ../src/crash.c:93
+#: ../src/crash.c:96
 msgid ""
 "An application has crashed on your system (now or in the past). Click on the "
 "notification icon to display details. "
 msgstr ""
 
 #. Create and show the notification
-#: ../src/avahi.c:15
+#: ../src/avahi.c:16
 msgid "Network service discovery disabled"
 msgstr ""
 
-#: ../src/avahi.c:16
+#: ../src/avahi.c:17
 msgid ""
 "Your current network has a .local domain, which is not recommended and "
 "incompatible with the Avahi network service discovery. The service has been "
 "disabled."
 msgstr ""
 
-#: ../src/gdu.c:53
+#: ../src/cdroms.c:48
 msgid "Software Packages Volume Detected"
 msgstr ""
 
-#: ../src/gdu.c:54
+#: ../src/cdroms.c:49
 msgid ""
 "<span weight=\"bold\" size=\"larger\">A volume with software packages has "
 "been detected.</span>\n"
@@ -117,15 +146,15 @@ msgid ""
 "Would you like to open it with the package manager?"
 msgstr ""
 
-#: ../src/gdu.c:62
+#: ../src/cdroms.c:57
 msgid "Start Package Manager"
 msgstr ""
 
-#: ../src/gdu.c:68
+#: ../src/cdroms.c:63
 msgid "Upgrade volume detected"
 msgstr ""
 
-#: ../src/gdu.c:69