Merge ~lamoura/ubuntu/+source/update-notifier:pro-bionic-release into ubuntu/+source/update-notifier:ubuntu/devel

[Lucas Albuquerque Medeiros de Moura]

Bionic release for Pro rebranding

Unmerged commits

4196706... by Lucas Albuquerque Medeiros de Moura on 2022-09-22

New bionic release

7eced80... by Lucas Albuquerque Medeiros de Moura on 2022-06-27

apt_check: update ESM service name (LP: #1980368)

Update naming and description for ESM services advertised
by the apt_check script

b857547... by Sebastien Bacher on 2020-04-02

Update Vcs information

8e8efd3... by Brian Murray on 2021-12-08

Sleep for up to an hour in the background in order to spread the load of checking for release updates on the Ubuntu infrastructure (LP: #1836475)

93a31a3... by Lucas Albuquerque Medeiros de Moura on 2021-12-08

* debian/control: add lsb-release to the update-notifier-common depends as
  it is used by apt-cdrom-check. (LP: #1927996)
* data/apt_check.py
  - Only show esm-apps alerts on lts and non-esm distros (LP: #1926990)
  - Update esm-infra alert for distros on ESM mode
  - Show message with number of upgradable packages even if that
    number is zero (LP: #1926819)
  - Get distro name and version directly from /etc/os-release
  - Fallback to lsb_release command if there are any problems using
    /etc/os-release as source of information
  - Show esm-apps status header when running on LTS distro that
    has not yet entered Extended Security Maintenance

fb21122... by Lucas Albuquerque Medeiros de Moura on 2021-12-08

* data/apt_check.py:
  - Add support to handle packages from ESM Apps in addition to ESM Infra
    and only display alerts if the distro is ESM. (LP: #1924766)
  - Do not display a count of ESM packages if the system does not have ESM
    enabled. (LP: #1883315)
  - Make distinction between standard security updates and ESM updates
    when performing package counts. (LP: #1926208)
  - use 'applied' instead of 'installed', redact 0 of these updates are
    security updates, and correct singular messages
* debian/control: Add a dependency on python3-distro-info.

3c6fca4... by Chad Smith on 2021-12-08

* 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/pyflakes autopkgtest failures (LP: #1906436)
  - d/control: add explicit pep8 build-requires dependency
  - test_motd.py: remove unused imports
  - pyflakes: data/backend_helper fix unittests for unreferenced
    variables
  - 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.
  - INSTALL, data/hooks.py, tests/test_package-data-downloader.py:
    Fix E117 over-indented pep issues. [ Gianfranco Costamagna ]
  - test_motd.py: Remove unused imports [ Julian Andres Klode ]
  - pyflakes: data/backend_helper fix unittests for unreferenced variables

79fd8db... by Chad Smith on 2021-12-08

* 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
* data/apt_check.py: modify wording and output regarding ESM support.
  (LP: #1842508)
* 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.

42bf0bd... by Sebastien Bacher on 2020-04-02

Update Vcs information

200bfaf... by Sebastien Bacher on 2019-05-24

releasing package update-notifier version 3.192.1.7

diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf
new file mode 100644
index 0000000..37780be
--- /dev/null
+++ b/.bzr-builddeb/default.conf
@@ -0,0 +1,5 @@
+[BUILDDEB]
+native = True
+
+[HOOKS]
+pre-build = ./autogen.sh
diff --git a/.bzrignore b/.bzrignore
new file mode 100644
index 0000000..126e770
--- /dev/null
+++ b/.bzrignore
@@ -0,0 +1,31 @@
+Makefile
+Makefile.in
+*.gmo
+aclocal.m4
+build-stamp
+config.h
+config.log
+config.guess
+config.status
+config.sub
+configure
+debian/*.debhelper
+debian/*.debhelper.log
+debian/*.substvars
+debian/files
+debian/tmp/
+debian/update-notifier/
+debian/update-notifier-common/
+depcomp
+install-sh
+missing
+stamp-h1
+po/.intltool-merge-cache
+po/Makefile.in.in
+po/POTFILES
+po/stamp-it
+po/update-notifier.pot
+src/.deps
+src/update-notifier
+data/update-notifier.desktop
+data/update-notifier.schemas
diff --git a/autogen.sh b/autogen.sh
index b36b4e9..00d2d46 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -15,11 +15,28 @@ PKG_NAME="Update Notifier"
     exit 1
 }
 
+<<<<<<< autogen.sh
 dpkg-checkbuilddeps -d 'libtool, automake, intltool, libglib2.0-dev'
 
+=======
+dpkg-checkbuilddeps -d 'libtool, automake, intltool, libglib2.0-dev, gnome-common'
+
+# do not use gnome-autogen.sh as long as it's broken
+>>>>>>> autogen.sh
 cd "$srcdir"
 autoreconf --force -i -v    
 intltoolize -c
 aclocal
 rm -rf autom4te.cache
 cd po; intltool-update -p --verbose
+<<<<<<< autogen.sh
+=======
+exit 0
+
+which gnome-autogen.sh || {
+    echo "You need to install gnome-common"
+    exit 1
+}
+
+USE_GNOME2_MACROS=1 . gnome-autogen.sh
+>>>>>>> autogen.sh
diff --git a/config.h.in b/config.h.in
index fb9979f..f2c6e2d 100644
--- a/config.h.in
+++ b/config.h.in
@@ -15,6 +15,7 @@
 /* Define to 1 if you have the `bind_textdomain_codeset' function. */
 #undef HAVE_BIND_TEXTDOMAIN_CODESET
 
+<<<<<<< config.h.in
 /* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
    CoreFoundation framework. */
 #undef HAVE_CFLOCALECOPYCURRENT
@@ -23,6 +24,8 @@
    the CoreFoundation framework. */
 #undef HAVE_CFPREFERENCESCOPYAPPVALUE
 
+=======
+>>>>>>> config.h.in
 /* Define to 1 if you have the `dcgettext' function. */
 #undef HAVE_DCGETTEXT
 
diff --git a/configure.ac b/configure.ac
index 100e7ad..042136f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,16 +72,27 @@ AC_ARG_ENABLE(appindicator,
                         [enable_appindicator="auto"])
 
 if test x$enable_appindicator = xauto ; then
+<<<<<<< configure.ac
         PKG_CHECK_EXISTS([ayatana-appindicator3-0.1 >= $APPINDICATOR_REQUIRED],
+=======
+        PKG_CHECK_EXISTS([appindicator3-0.1 >= $APPINDICATOR_REQUIRED],
+>>>>>>> configure.ac
                          enable_appindicator="yes",
                          enable_appindicator="no")
 fi
 
 if test x$enable_appindicator = xyes ; then
+<<<<<<< configure.ac
         PKG_CHECK_EXISTS([ayatana-appindicator3-0.1 >= $APPINDICATOR_REQUIRED],,
                          AC_MSG_ERROR([ayatana-appindicator3-0.1 is not installed]))
         PKG_CHECK_MODULES(APP_INDICATOR,
                         ayatana-appindicator3-0.1 >= $APPINDICATOR_REQUIRED)
+=======
+        PKG_CHECK_EXISTS([appindicator3-0.1 >= $APPINDICATOR_REQUIRED],,
+                         AC_MSG_ERROR([appindicator3-0.1 is not installed]))
+        PKG_CHECK_MODULES(APP_INDICATOR,
+                        appindicator3-0.1 >= $APPINDICATOR_REQUIRED)
+>>>>>>> configure.ac
         AC_SUBST(APP_INDICATOR_CFLAGS)
         AC_SUBST(APP_INDICATOR_LIBS)
         AC_DEFINE(HAVE_APP_INDICATOR, 1, [Have AppIndicator])
diff --git a/data/Makefile.am b/data/Makefile.am
index 3a2cc29..62b42e2 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,7 +1,11 @@
 @INTLTOOL_DESKTOP_RULE@
 
 desktopdir       = $(sysconfdir)/xdg/autostart
+<<<<<<< data/Makefile.am
 desktop_in_files = update-notifier.desktop.in ubuntu-advantage-notification.desktop.in
+=======
+desktop_in_files = update-notifier.desktop.in
+>>>>>>> data/Makefile.am
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
 @INTLTOOL_XML_NOMERGE_RULE@
@@ -13,10 +17,17 @@ policydir = $(datadir)/polkit-1/actions
 policy_DATA = com.ubuntu.update-notifier.policy
 
 helperdir = $(libdir)/update-notifier
+<<<<<<< data/Makefile.am
 helper_SCRIPTS = apt_check.py apt-cdrom-check cddistupgrader list-oem-metapackages update-motd-reboot-required update-motd-updates-available update-motd-fsck-at-reboot update-motd-hwe-eol backend_helper.py package-data-downloader package-system-locked
 
 notifydir = $(datadir)/update-notifier
 notify_SCRIPTS = notify-reboot-required notify-updates-outdated
+=======
+helper_SCRIPTS = apt_check.py apt-cdrom-check cddistupgrader update-motd-reboot-required update-motd-updates-available update-motd-fsck-at-reboot update-motd-hwe-eol backend_helper.py package-data-downloader package-system-locked
+
+notifydir = $(datadir)/update-notifier
+notify_SCRIPTS = notify-reboot-required
+>>>>>>> data/Makefile.am
 notify_in_files = package-data-downloads-failed.in package-data-downloads-failed-permanently.in
 notify_DATA = $(notify_in_files:.in=)
 
diff --git a/data/apt_check.py b/data/apt_check.py
index 6e0ffd1..eb3fe7d 100755
--- a/data/apt_check.py
+++ b/data/apt_check.py
@@ -11,6 +11,10 @@ from optparse import OptionParser
 import re
 import gettext
 import distro_info
+<<<<<<< data/apt_check.py
+=======
+import subprocess
+>>>>>>> data/apt_check.py
 
 
 SYNAPTIC_PINFILE = "/var/lib/synaptic/preferences"
@@ -41,9 +45,28 @@ def _get_info_from_os_release(key):
         )
 
 
+<<<<<<< data/apt_check.py
 def get_distro():
     " get distro name "
     return _get_info_from_os_release(key="UBUNTU_CODENAME")
+=======
+def _get_output_from_lsb_release(lsb_option):
+    " get info from lsb_release output "
+    return subprocess.check_output(
+        ["lsb_release", lsb_option, "-s"], universal_newlines=True
+    ).strip()
+
+
+def get_distro():
+    " get distro name "
+    try:
+        return _get_info_from_os_release(key="UBUNTU_CODENAME")
+    except Exception:
+        # If the system does not have os-release file or does not have the
+        # required entry in it, we will get the distro name from lsb_release
+        # command
+        return _get_output_from_lsb_release("-c")
+>>>>>>> data/apt_check.py
 
 
 DISTRO = get_distro()
@@ -64,7 +87,17 @@ def _handleException(type, value, tb):
 
 def get_distro_version():
     " get distro version "
+<<<<<<< data/apt_check.py
     return _get_info_from_os_release(key="VERSION_ID").replace('"', "")
+=======
+    try:
+        return _get_info_from_os_release(key="VERSION_ID").replace('"', "")
+    except Exception:
+        # If the system does not have os-release file or does not have the
+        # required entry in it, we will get the distro name from lsb_release
+        # command
+        return _get_output_from_lsb_release("-r")
+>>>>>>> data/apt_check.py
 
 
 def clean(cache, depcache):
@@ -208,12 +241,21 @@ def _output_esm_package_alert(
 def _output_esm_service_status(outstream, have_esm_service, service_type):
     if have_esm_service:
         outstream.write(gettext.dgettext("update-notifier",
+<<<<<<< data/apt_check.py
                                          "Expanded Security Maintenance for "
                                          "%s is enabled.") % service_type)
     else:
         outstream.write(gettext.dgettext("update-notifier",
                                          "Expanded Security Maintenance for "
                                          "%s is not enabled.") % service_type)
+=======
+                                         "Expanded Security Maintenance for %s is "
+                                         "enabled.") % service_type)
+    else:
+        outstream.write(gettext.dgettext("update-notifier",
+                                         "Expanded Security Maintenance for %s is "
+                                         "not enabled.") % service_type)
+>>>>>>> data/apt_check.py
     outstream.write("\n\n")
 
 
@@ -223,7 +265,11 @@ def write_human_readable_summary(outstream, upgrades, security_updates,
                                  disabled_esm_infra_updates,
                                  disabled_esm_apps_updates):
 
+<<<<<<< data/apt_check.py
     " write out human summary summary to outstream "
+=======
+    " write out human summary to outstream "
+>>>>>>> data/apt_check.py
     esm_distro = is_esm_distro()
     lts_distro = is_lts_distro()
 
diff --git a/data/backend_helper.py b/data/backend_helper.py
index b4cb3b8..5160a4d 100755
--- a/data/backend_helper.py
+++ b/data/backend_helper.py
@@ -18,12 +18,18 @@ except ImportError:
 # show updates
 def show_updates():
     """ show updates using update-manager """
+<<<<<<< data/backend_helper.py
     if os.path.exists("/usr/bin/update-manager"):
         cmd = ["update-manager", "--no-update"]
         res = subprocess.call(cmd)
         return (res == 0)
     else:
         logging.error("update-manager is not installed")
+=======
+    cmd = ["update-manager", "--no-update"]
+    res = subprocess.call(cmd)
+    return (res == 0)
+>>>>>>> data/backend_helper.py
 
 
 # install all updates
diff --git a/data/com.ubuntu.update-notifier.gschema.xml.in b/data/com.ubuntu.update-notifier.gschema.xml.in
index b935b5a..55b3db0 100644
--- a/data/com.ubuntu.update-notifier.gschema.xml.in
+++ b/data/com.ubuntu.update-notifier.gschema.xml.in
@@ -28,12 +28,16 @@
     <key name="show-livepatch-status-icon" type="b">
       <default>true</default>
       <summary>Show Livepatch status icon</summary>
+<<<<<<< data/com.ubuntu.update-notifier.gschema.xml.in
       <description>Enable or disable the Livepatch status icon in the systray.</description>
     </key>
     <key name="notify-ubuntu-advantage-available" type="b">
       <default>false</default>
       <summary>Notify user is able to attach to Ubuntu Advantage</summary>
       <description>If the user should be notified that they are not connected to Ubuntu advantage. Set to False if the user has opted out of these notifications.</description>
+=======
+      <description>Enable or diable the Livepatch status icon in the systray.</description>
+>>>>>>> data/com.ubuntu.update-notifier.gschema.xml.in
     </key>
   </schema>
 </schemalist>
diff --git a/data/notify-reboot-required b/data/notify-reboot-required
index ed9985b..927338e 100644
--- a/data/notify-reboot-required
+++ b/data/notify-reboot-required
@@ -22,6 +22,7 @@ if [ "$0" = "/etc/kernel/postinst.d/update-notifier" ]; then
     DPKG_MAINTSCRIPT_PACKAGE=linux-base
 fi
 
+<<<<<<< data/notify-reboot-required
 KERNEL_UPGRADED=0
 # Prefer showing the canonical-livepatch reboot message if one is required
 if [ -f "/snap/bin/canonical-livepatch" ]; then
@@ -45,6 +46,8 @@ if [ $KERNEL_UPGRADED -eq 1 ]; then
     fi
 fi
 
+=======
+>>>>>>> data/notify-reboot-required
 # Wake the applet up
 echo "*** $(eval_gettext "System restart required") ***" > /var/run/reboot-required
 echo "$DPKG_MAINTSCRIPT_PACKAGE" >> /var/run/reboot-required.pkgs
diff --git a/data/package-data-downloader b/data/package-data-downloader
index 789142e..67b523d 100755
--- a/data/package-data-downloader
+++ b/data/package-data-downloader
@@ -26,8 +26,11 @@ import string
 import debconf
 from datetime import datetime
 
+<<<<<<< data/package-data-downloader
 import apt_pkg
 
+=======
+>>>>>>> data/package-data-downloader
 # avoid hanging forever (LP: #1243090)
 import socket
 socket.setdefaulttimeout(60)
@@ -178,6 +181,7 @@ def download_file(uri, sha256_hashsum):
     """
     download_dir = os.path.join(STAMPDIR, "partial")
     dest_file = os.path.join(download_dir, os.path.basename(uri))
+<<<<<<< data/package-data-downloader
     try:
         with open(dest_file, 'rb') as dest_file_obj:
             # apt_pkg can directly hash from file obj, let's use that instead
@@ -190,6 +194,8 @@ def download_file(uri, sha256_hashsum):
     except FileNotFoundError:
         pass
 
+=======
+>>>>>>> data/package-data-downloader
     ret = subprocess.call(
         ["/usr/lib/apt/apt-helper",
          "download-file", uri, dest_file, "SHA256:" + sha256_hashsum])
diff --git a/data/update-motd-fsck-at-reboot b/data/update-motd-fsck-at-reboot
index c027236..e683c42 100755
--- a/data/update-motd-fsck-at-reboot
+++ b/data/update-motd-fsck-at-reboot
@@ -7,11 +7,14 @@ set -e
 # poor mans force
 if [ "$1" = "--force" ]; then
     NEEDS_FSCK_CHECK=yes
+<<<<<<< data/update-motd-fsck-at-reboot
 else
     if [ "$(id -u)" != 0 ] ; then
         exit
     fi
     NEED_FSCK_CHECK=no
+=======
+>>>>>>> data/update-motd-fsck-at-reboot
 fi
 
 # check time when we did the last check
@@ -38,7 +41,11 @@ if [ -n "$NEEDS_FSCK_CHECK" ]; then
   {
     check_occur_any=
 
+<<<<<<< data/update-motd-fsck-at-reboot
     ext_partitions=$(mount | awk '$5 ~ /^ext(2|3|4)$/ { print $1 }' | grep -v "/dev/nbd" || true)
+=======
+    ext_partitions=$(mount | awk '$5 ~ /^ext(2|3|4)$/ { print $1 }')
+>>>>>>> data/update-motd-fsck-at-reboot
     for part in $ext_partitions; do
         dumpe2fs_out=$(dumpe2fs -h $part 2>/dev/null)
         mount_count=$(echo "$dumpe2fs_out" | grep "^Mount count:"|cut -d':' -f 2-)
diff --git a/data/update-motd-hwe-eol b/data/update-motd-hwe-eol
index 68e6c73..4e3f5e3 100755
--- a/data/update-motd-hwe-eol
+++ b/data/update-motd-hwe-eol
@@ -7,9 +7,12 @@
 if [ "$1" = "--force" ]; then
     NEED_EOL_CHECK=yes
 else
+<<<<<<< data/update-motd-hwe-eol
     if type systemd-detect-virt > /dev/null 2>&1  && systemd-detect-virt -q -c; then
         exit
     fi
+=======
+>>>>>>> data/update-motd-hwe-eol
     NEED_EOL_CHECK=no
 fi
 
@@ -37,21 +40,32 @@ cleanup() { rm -f "$tmpfile"; }
 
 # check if we have a list file or sources.list that needs checking
 if [ -e "$stamp" ]; then
+<<<<<<< data/update-motd-hwe-eol
     if [ "$(find "/$StateDir/$ListDir" "/$EtcDir/$SourceList" "/$DpkgStatus" -type f -newer "$stamp" -print -quit 2> /dev/null)" ]; then
         NEED_EOL_CHECK=yes
     fi
 else
     if [ "$(find "/$StateDir/$ListDir" "/$EtcDir/$SourceList" -type f -print -quit 2> /dev/null)" ]; then
+=======
+    if [ "$(find "/$StateDir/$ListDir" "/$EtcDir/$SourceList" "/$DpkgStatus" -type f -newer "$stamp" -print -quit)" ]; then
+        NEED_EOL_CHECK=yes
+    fi
+else
+    if [ "$(find "/$StateDir/$ListDir" "/$EtcDir/$SourceList" -type f -print -quit)" ]; then
+>>>>>>> data/update-motd-hwe-eol
         NEED_EOL_CHECK=yes
     fi
 fi
 
+<<<<<<< data/update-motd-hwe-eol
 # only print status when running this script as a regular user
 if [ "$(id -u)" != 0 ] ; then
    [ "$NEED_EOL_CHECK" = "no" ] || /usr/bin/hwe-support-status || true
    exit
 fi
 
+=======
+>>>>>>> data/update-motd-hwe-eol
 tmpfile=""
 trap cleanup EXIT
 tmpfile=$(mktemp -p $(dirname "$stamp"))
diff --git a/data/update-motd-updates-available b/data/update-motd-updates-available
index 2f5e5b6..4404aad 100755
--- a/data/update-motd-updates-available
+++ b/data/update-motd-updates-available
@@ -56,5 +56,8 @@ if [ "$NEED_UPDATE_CHECK" = "yes" ]; then
         echo ""
     } > "$tmpfile"
     mv "$tmpfile" "$stamp"
+<<<<<<< data/update-motd-updates-available
     chmod +r "$stamp"
+=======
+>>>>>>> data/update-motd-updates-available
 fi
diff --git a/debian/90-updates-available b/debian/90-updates-available
index 9377fdc..6d8cbbe 100755
--- a/debian/90-updates-available
+++ b/debian/90-updates-available
@@ -3,5 +3,8 @@
 stamp="/var/lib/update-notifier/updates-available"
 
 [ ! -r "$stamp" ] || cat "$stamp"
+<<<<<<< debian/90-updates-available
 
 find $stamp -newermt 'now-7 days' 2> /dev/null | grep -q -m 1 '.' || /usr/share/update-notifier/notify-updates-outdated
+=======
+>>>>>>> debian/90-updates-available
diff --git a/debian/95-hwe-eol b/debian/95-hwe-eol
index 92d0c7d..4f754fc 100755
--- a/debian/95-hwe-eol
+++ b/debian/95-hwe-eol
@@ -1,11 +1,14 @@
 #!/bin/sh
 
+<<<<<<< debian/95-hwe-eol
 # this stamp is created and updated by /usr/lib/update-notifier/update-motd-hwe-eol
 stamp="/var/lib/update-notifier/hwe-eol"
 
 # do not try to refresh this more than once per day
 [ -z "$(find "$stamp" -newermt 'now-1 days' 2> /dev/null)" ] && exit 0
 
+=======
+>>>>>>> debian/95-hwe-eol
 if [ -x /usr/lib/update-notifier/update-motd-hwe-eol ]; then
     exec /usr/lib/update-notifier/update-motd-hwe-eol
 fi
diff --git a/debian/changelog b/debian/changelog
index 2efff87..75a90b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,4 @@
+<<<<<<< debian/changelog
 update-notifier (3.192.57) kinetic; urgency=medium
 
   [ Lucas Albuquerque Medeiros de Moura ]
@@ -120,12 +121,34 @@ update-notifier (3.192.44) impish; urgency=medium
 update-notifier (3.192.43) impish; urgency=medium
 
   [ Lucas Moura ]
+=======
+update-notifier (3.192.1.13) bionic; urgency=medium
+
+  * Update the ESM service name and description for the apt_check.py script
+    (LP: #1980368).
+
+ -- Lucas Moura <[e-mail]>  Thu, 22 Sep 2022 13:43:17 -0300
+
+update-notifier (3.192.1.12) bionic; urgency=medium
+
+  * Sleep for up to an hour in the background in order to spread the load
+    of checking for release updates on the Ubuntu infrastructure
+    (LP: #1836475)
+
+ -- Brian Murray <[e-mail]>  Mon, 23 Aug 2021 15:33:27 -0700
+
+update-notifier (3.192.1.11) bionic; urgency=medium
+
+  * debian/control: add lsb-release to the update-notifier-common depends as
+    it is used by apt-cdrom-check. (LP: #1927996)
+>>>>>>> debian/changelog
   * data/apt_check.py
     - Only show esm-apps alerts on lts and non-esm distros (LP: #1926990)
     - Update esm-infra alert for distros on ESM mode
     - Show message with number of upgradable packages even if that
       number is zero (LP: #1926819)
     - Get distro name and version directly from /etc/os-release
+<<<<<<< debian/changelog
 
   [ Brian Murray ]
   * debian/control: add lsb-release to the update-notifier-common depends as
@@ -144,6 +167,17 @@ update-notifier (3.192.42) impish; urgency=medium
 update-notifier (3.192.41) impish; urgency=medium
 
   [ Lucas Moura ]
+=======
+    - Fallback to lsb_release command if there are any problems using
+      /etc/os-release as source of information
+    - Show esm-apps status header when running on LTS distro that
+      has not yet entered Extended Security Maintenance
+
+ -- Lucas Moura <[e-mail]>  Fri, 14 May 2021 15:43:17 -0300
+
+update-notifier (3.192.1.10) bionic; urgency=medium
+
+>>>>>>> debian/changelog
   * data/apt_check.py:
     - Add support to handle packages from ESM Apps in addition to ESM Infra
       and only display alerts if the distro is ESM. (LP: #1924766)
@@ -155,6 +189,7 @@ update-notifier (3.192.41) impish; urgency=medium
       security updates, and correct singular messages
   * debian/control: Add a dependency on python3-distro-info.
 
+<<<<<<< debian/changelog
  -- Chad Smith <[e-mail]>  Thu, 22 Apr 2021 17:47:19 -0600
 
 update-notifier (3.192.40) hirsute; urgency=medium
@@ -245,12 +280,45 @@ update-notifier (3.192.33) groovy; urgency=medium
 update-notifier (3.192.32) groovy; urgency=medium
 
   [ Chad Smith ]
+=======
+ -- Lucas Moura <[e-mail]>  Thu, 22 Apr 2021 18:39:19 -0300
+
+update-notifier (3.192.1.9) bionic; 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/pyflakes autopkgtest failures (LP: #1906436)
+    - d/control: add explicit pep8 build-requires dependency
+    - test_motd.py: remove unused imports
+    - pyflakes: data/backend_helper fix unittests for unreferenced
+      variables
+    - 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 ]
+    - test_motd.py: Remove unused imports [ Julian Andres Klode ]
+    - pyflakes: data/backend_helper fix unittests for unreferenced variables
+
+ -- Chad Smith <[e-mail]>  Mon, 30 Nov 2020 14:25:35 -0700
+
+update-notifier (3.192.1.8) bionic; urgency=medium
+
+  [ Andreas Hasenack ]
+>>>>>>> debian/changelog
   * 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
 
+<<<<<<< debian/changelog
  -- Andreas Hasenack <[e-mail]>  Fri, 12 Jun 2020 11:21:25 -0300
 
 update-notifier (3.192.31) groovy; urgency=medium
@@ -424,12 +492,50 @@ update-notifier (3.192.9) disco; urgency=medium
  -- Brian Murray <[e-mail]>  Tue, 13 Nov 2018 11:47:45 -0800
 
 update-notifier (3.192.8) disco; urgency=medium
+=======
+  [ Brian Murray ]
+  * data/apt_check.py: modify wording and output regarding ESM support.
+    (LP: #1842508)
+
+  [ 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.
+
+ -- Chad Smith <[e-mail]>  Tue, 29 Sep 2020 16:49:23 -0600
+
+update-notifier (3.192.1.7) bionic; urgency=medium
+
+  * Backport some fixes for the previous changes, from Andrea Azzarone
+  * Don't show the Livepatch indicator if livepatch is disabled.
+  * Livepatch, Handle "applying" Livepatch state
+
+ -- Sebastien Bacher <[e-mail]>  Fri, 24 May 2019 11:46:37 +0200
+
+update-notifier (3.192.1.6) bionic; urgency=medium
+
+  * Add a Livepatch indicator in the system tray. (LP: #1820259)
+  * Add a "Settings..." button to the Livepatch notification. (LP: #1823351)
+
+ -- Andrea Azzarone <[e-mail]>  Fri, 05 Apr 2019 15:20:05 +0100
+
+update-notifier (3.192.1.5) bionic; urgency=medium
+
+  * [ Andrea Azzarone ]
+  * src/update-notifier.c: Don't use G_SPAWN_DO_NOT_REAP_CHILD in order
+    to avoid zombie processes. (LP: #1809505)
+
+ -- Sebastien Bacher <[e-mail]>  Thu, 17 Jan 2019 15:17:42 +0100
+
+update-notifier (3.192.1.4) bionic; urgency=medium
+>>>>>>> debian/changelog
 
   * Check if a Livepatch patch has been applied during boot or before
     update-notifier has started. (LP: #1800862)
 
  -- Andrea Azzarone <[e-mail]>  Fri, 02 Nov 2018 11:34:03 +0000
 
+<<<<<<< debian/changelog
 update-notifier (3.192.7) cosmic; urgency=medium
 
   * Use absolute patch when testing if whoopsie service is enabled.
@@ -454,11 +560,30 @@ update-notifier (3.192.5) cosmic; urgency=medium
  -- Julian Andres Klode <[e-mail]>  Tue, 29 May 2018 09:38:23 +0200
 
 update-notifier (3.192.4) cosmic; urgency=medium
+=======
+update-notifier (3.192.1.3) bionic; urgency=medium
+
+  * Use absolute patch when testing if whoopsie service is enabled.
+    (Thanks Jean-Baptiste!)
+  * Add some debug messages
+
+ -- Didier Roche <[e-mail]>  Mon, 02 Jul 2018 11:27:13 +0200
+
+update-notifier (3.192.1.2) bionic; urgency=medium
+
+  * Only show apport UI if whoopsie is not in auto or never reporting mode.
+    (LP: #1778697)
+
+ -- Didier Roche <[e-mail]>  Wed, 27 Jun 2018 10:00:08 +0200
+
+update-notifier (3.192.1.1) bionic; urgency=medium
+>>>>>>> debian/changelog
 
   * package-data-downloader: Only print processing messages if we
     should download stuff, or if an expected exception occured
     (LP: #1641671)
 
+<<<<<<< debian/changelog
  -- Julian Andres Klode <[e-mail]>  Fri, 25 May 2018 18:15:22 +0200
 
 update-notifier (3.192.3) cosmic; urgency=medium
@@ -475,6 +600,9 @@ update-notifier (3.192.2) cosmic; urgency=medium
   * Bump debhelper version to 11, and do autoreconf
 
  -- Gianfranco Costamagna <[e-mail]>  Wed, 09 May 2018 10:13:54 +0200
+=======
+ -- Julian Andres Klode <[e-mail]>  Mon, 18 Jun 2018 16:11:40 +0200
+>>>>>>> debian/changelog
 
 update-notifier (3.192.1) bionic; urgency=medium
 
diff --git a/debian/compat b/debian/compat
index b4de394..84454a7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1,5 @@
+<<<<<<< debian/compat
 11
+=======
+7
+>>>>>>> debian/compat
diff --git a/debian/control b/debian/control
index a2d5c02..4990ae1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,11 @@ Source: update-notifier
 Section: gnome
 Priority: optional
 Maintainer: Michael Vogt <[e-mail]>
+<<<<<<< debian/control
 Build-Depends: debhelper (>= 11~),
+=======
+Build-Depends: debhelper (>= 7.0.50~),
+>>>>>>> debian/control
                dh-python,
                libgtk-3-dev,
                libglib2.0-dev (>= 2.34),
@@ -11,8 +15,14 @@ Build-Depends: debhelper (>= 11~),
                libnotify-dev (>= 0.7),
                libgudev-1.0-dev,
                libx11-dev,
+<<<<<<< debian/control
                libayatana-appindicator3-dev,
                lsb-release,
+=======
+               autotools-dev,
+               libappindicator3-dev,
+               pep8,
+>>>>>>> debian/control
                po-debconf,
                python3,
                python3-apt,
@@ -20,9 +30,16 @@ Build-Depends: debhelper (>= 11~),
                python3-debian,
                python3-distro-info,
                python3-mock
+<<<<<<< debian/control
 Standards-Version: 4.5.0
 Vcs-Git: https://git.launchpad.net/update-notifier -b master
 XS-Testsuite: autopkgtest
+=======
+Standards-Version: 3.9.4
+Vcs-Git: https://git.launchpad.net/update-notifier -b bionic
+XS-Testsuite: autopkgtest
+X-Python3-Version: >= 3.2
+>>>>>>> debian/control
 
 Package: update-notifier
 Architecture: any
@@ -30,16 +47,27 @@ Depends: ${shlibs:Depends},
          ${misc:Depends},
          update-notifier-common (= ${source:Version}),
          python3-dbus,
+<<<<<<< debian/control
          ubuntu-drivers-common,
          update-manager-gnome | update-manager (>= 1:17.04.3),
          ubuntu-release-upgrader-gtk,
          gnome-shell <!s390x> | notification-daemon <!s390x>,
+=======
+         update-manager-gnome | update-manager (>= 1:17.04.3),
+         ubuntu-release-upgrader-gtk,
+         notification-daemon,
+>>>>>>> debian/control
          policykit-1
 Recommends: apport-gtk (>=2.8-0ubuntu3), 
             python3-aptdaemon.gtk3widgets | synaptic (>= 0.75.12), 
             software-properties-gtk, 
+<<<<<<< debian/control
             python3-aptdaemon,
             whoopsie (>= 0.2.77)
+=======
+            anacron, 
+            python3-aptdaemon
+>>>>>>> debian/control
 Description: Daemon which notifies about package updates
  Puts an icon in the user's notification area when package updates are
  available.
diff --git a/debian/rules b/debian/rules
index 73fe23e..e6b0cf0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,7 @@ export CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
 export LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
 %:
+<<<<<<< debian/rules
 	dh $@ --with python3 --with autoreconf
 
 override_dh_autoreconf:
@@ -15,3 +16,9 @@ override_dh_auto_test:
 	cd tests && python3 test_package-data-downloader.py
 	cd tests && python3 test_motd.py
 
+=======
+	dh $@ --with python3
+
+override_dh_auto_test:
+	cd tests && python3 test_package-data-downloader.py
+>>>>>>> debian/rules
diff --git a/debian/systemd/unicast-local-avahi.override b/debian/systemd/unicast-local-avahi.override
new file mode 100644
index 0000000..2905494
--- /dev/null
+++ b/debian/systemd/unicast-local-avahi.override
@@ -0,0 +1 @@
+manual
diff --git a/debian/systemd/unicast-local-avahi.path b/debian/systemd/unicast-local-avahi.path
new file mode 100644
index 0000000..be370c4
--- /dev/null
+++ b/debian/systemd/unicast-local-avahi.path
@@ -0,0 +1,6 @@
+[Unit]
+Description=Path trigger for Avahi .local domain notifications
+PartOf=graphical-session.target
+
+[Path]
+PathChanged=/run/avahi-daemon/disabled-for-unicast-local
diff --git a/debian/systemd/unicast-local-avahi.service b/debian/systemd/unicast-local-avahi.service
new file mode 100644
index 0000000..ec11a89
--- /dev/null
+++ b/debian/systemd/unicast-local-avahi.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=Notification regarding avahi disabled due to .local domain
+
+[Service]
+ExecStart=/usr/lib/update-notifier/local-avahi-notification
+Type=oneshot
diff --git a/debian/systemd/update-notifier-crash.path b/debian/systemd/update-notifier-crash.path
index 79d9160..7c83d51 100644
--- a/debian/systemd/update-notifier-crash.path
+++ b/debian/systemd/update-notifier-crash.path
@@ -1,7 +1,10 @@
 [Unit]
 Description=Path trigger for Apport crash notifications
 PartOf=graphical-session.target
+<<<<<<< debian/systemd/update-notifier-crash.path
 ConditionPathExists=!/var/lib/apport/autoreport
+=======
+>>>>>>> debian/systemd/update-notifier-crash.path
 
 [Path]
 PathChanged=/var/crash/
diff --git a/debian/systemd/update-notifier-crash.service b/debian/systemd/update-notifier-crash.service
index fa6bcfa..9106394 100644
--- a/debian/systemd/update-notifier-crash.service
+++ b/debian/systemd/update-notifier-crash.service
@@ -1,9 +1,15 @@
 [Unit]
 Description=Notification regarding a crash report
 PartOf=graphical-session.target
+<<<<<<< debian/systemd/update-notifier-crash.service
 ConditionPathExists=!/var/lib/apport/autoreport
+=======
+>>>>>>> debian/systemd/update-notifier-crash.service
 
 [Service]
 ExecStart=/usr/lib/update-notifier/update-notifier-crash
 Type=oneshot
+<<<<<<< debian/systemd/update-notifier-crash.service
 KillMode=process
+=======
+>>>>>>> debian/systemd/update-notifier-crash.service
diff --git a/debian/tests/control b/debian/tests/control
index f053df1..987f2b1 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,7 @@
 Tests: nose-tests
+<<<<<<< debian/tests/control
 Depends: @, pycodestyle, pyflakes3, python3-mock, python3-nose
+=======
+Depends: @, pep8, pyflakes, python3-mock, python3-nose
+>>>>>>> debian/tests/control
 Restrictions: allow-stderr
diff --git a/debian/unicast-local-avahi.conf b/debian/unicast-local-avahi.conf
new file mode 100644
index 0000000..69c5db0
--- /dev/null
+++ b/debian/unicast-local-avahi.conf
@@ -0,0 +1,14 @@
+description "Notification regarding avahi disabled due to .local domain"
+author "Brian Murray <[e-mail]>"
+
+start on (
+    file FILE=/run/avahi-daemon/disabled-for-unicast-local EVENT=create
+)
+
+
+script
+echo $(date)
+echo "avahi disabled"
+sleep 5
+/usr/lib/update-notifier/local-avahi-notification
+end script
diff --git a/debian/update-notifier-common.cron.daily b/debian/update-notifier-common.cron.daily
new file mode 100644
index 0000000..e90d153
--- /dev/null
+++ b/debian/update-notifier-common.cron.daily
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e
+
+[ -x /usr/lib/update-notifier/package-data-downloader ] || exit 0
+
+# Try to rerun any package data downloads that failed at package install time.
+/usr/lib/update-notifier/package-data-downloader
diff --git a/debian/update-notifier-common.cron.weekly b/debian/update-notifier-common.cron.weekly
new file mode 100644
index 0000000..0e87107
--- /dev/null
+++ b/debian/update-notifier-common.cron.weekly
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+[ -x /usr/lib/ubuntu-release-upgrader/release-upgrade-motd ] || exit 0
+
+sleep_then_check() {
+    # Sleep for up to an hour to spread the load of checking for updates on
+    # the Ubuntu infrastructure
+    sleep $(shuf -i 1-3600 -n 1)
+    # Check to see whether there is a new version of Ubuntu available
+    /usr/lib/ubuntu-release-upgrader/release-upgrade-motd
+}
+
+sleep_then_check &
diff --git a/debian/update-notifier-common.install b/debian/update-notifier-common.install
index 15a2ac6..5fb4de4 100644
--- a/debian/update-notifier-common.install
+++ b/debian/update-notifier-common.install
@@ -8,14 +8,20 @@ debian/98-reboot-required etc/update-motd.d
 debian/98-fsck-at-reboot etc/update-motd.d
 usr/share/polkit-1/actions/com.ubuntu.update-notifier.policy
 usr/share/update-notifier/notify-reboot-required
+<<<<<<< debian/update-notifier-common.install
 usr/share/update-notifier/notify-updates-outdated
+=======
+>>>>>>> debian/update-notifier-common.install
 usr/share/update-notifier/package-data-downloads-failed
 usr/share/update-notifier/package-data-downloads-failed-permanently
 usr/lib/update-notifier/
 usr/share/locale
 debian/update-manager-downloader-fix2.diff usr/share/update-notifier/upgrader-patches
+<<<<<<< debian/update-notifier-common.install
 # systemd timers
 debian/systemd/update-notifier-motd.service lib/systemd/system
 debian/systemd/update-notifier-motd.timer lib/systemd/system
 debian/systemd/update-notifier-download.service lib/systemd/system
 debian/systemd/update-notifier-download.timer lib/systemd/system
+=======
+>>>>>>> debian/update-notifier-common.install
diff --git a/debian/update-notifier-common.postinst b/debian/update-notifier-common.postinst
index d3789f0..f5c9efc 100644
--- a/debian/update-notifier-common.postinst
+++ b/debian/update-notifier-common.postinst
@@ -28,4 +28,11 @@ chmod 700 /var/lib/update-notifier/package-data-downloads/partial/
 # depending on package unpack order.
 /usr/lib/update-notifier/package-data-downloader
 
+<<<<<<< debian/update-notifier-common.postinst
+=======
+# Remove update-motd cpu-checker script
+dpkg-maintscript-helper rm_conffile /etc/update-motd.d/20-cpu-checker \
+        0.110.1ubuntu1 -- "$@"
+
+>>>>>>> debian/update-notifier-common.postinst
 #DEBHELPER#
diff --git a/debian/update-notifier-common.postrm b/debian/update-notifier-common.postrm
new file mode 100644
index 0000000..a4e0c0b
--- /dev/null
+++ b/debian/update-notifier-common.postrm
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e
+
+dpkg-maintscript-helper rm_conffile /etc/update-motd.d/20-cpu-checker \
+	0.110.1ubuntu1 -- "$@"
+
+#DEBHELPER#
diff --git a/debian/update-notifier-common.preinst b/debian/update-notifier-common.preinst
new file mode 100644
index 0000000..a4e0c0b
--- /dev/null
+++ b/debian/update-notifier-common.preinst
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e
+
+dpkg-maintscript-helper rm_conffile /etc/update-motd.d/20-cpu-checker \
+	0.110.1ubuntu1 -- "$@"
+
+#DEBHELPER#
diff --git a/debian/update-notifier-common.triggers b/debian/update-notifier-common.triggers
index c6c76fa..e2d0659 100644
--- a/debian/update-notifier-common.triggers
+++ b/debian/update-notifier-common.triggers
@@ -1 +1,5 @@
+<<<<<<< debian/update-notifier-common.triggers
 interest-noawait /usr/share/package-data-downloads
+=======
+interest /usr/share/package-data-downloads
+>>>>>>> debian/update-notifier-common.triggers
diff --git a/debian/update-notifier-crash b/debian/update-notifier-crash
index 089f503..366abfc 100755
--- a/debian/update-notifier-crash
+++ b/debian/update-notifier-crash
@@ -1,6 +1,7 @@
 #!/bin/sh
 set -e
 
+<<<<<<< debian/update-notifier-crash
 # if whoopsie in never report mode, don't show anything.
 which whoopsie
 has_whoopsie=$?
@@ -10,6 +11,8 @@ if [ $has_whoopsie -eq 0 -a $whoopsie_enabled -ne 0 ]; then
     exit 0
 fi
 
+=======
+>>>>>>> debian/update-notifier-crash
 if /usr/share/apport/apport-checkreports; then
     /usr/share/apport/apport-gtk
 else
diff --git a/debian/update-notifier.install b/debian/update-notifier.install
index 26fdef3..0766cae 100644
--- a/debian/update-notifier.install
+++ b/debian/update-notifier.install
@@ -1,5 +1,8 @@
 etc/xdg/autostart/update-notifier.desktop
+<<<<<<< debian/update-notifier.install
 etc/xdg/autostart/ubuntu-advantage-notification.desktop
+=======
+>>>>>>> debian/update-notifier.install
 usr/share/update-notifier/ui/hooks-dialog.ui
 usr/share/icons/hicolor/16x16/
 usr/share/icons/hicolor/22x22/
@@ -10,22 +13,40 @@ usr/share/glib-2.0/schemas/com.ubuntu.update-notifier.gschema.xml
 usr/bin/update-notifier
 usr/bin/distro-cd-updater usr/lib/update-notifier/
 usr/bin/livepatch-notification usr/lib/update-notifier/
+<<<<<<< debian/update-notifier.install
 usr/bin/system-crash-notification usr/lib/update-notifier/
 usr/bin/ubuntu-advantage-notification usr/lib/update-notifier/
 # upstart jobs
 debian/update-notifier-cds.conf usr/share/upstart/sessions/
 debian/update-notifier-hp-firmware.conf usr/share/upstart/sessions/
+=======
+usr/bin/local-avahi-notification usr/lib/update-notifier/
+usr/bin/system-crash-notification usr/lib/update-notifier/
+# upstart jobs
+debian/update-notifier-cds.conf usr/share/upstart/sessions/
+debian/update-notifier-hp-firmware.conf usr/share/upstart/sessions/
+debian/unicast-local-avahi.conf usr/share/upstart/sessions/
+>>>>>>> debian/update-notifier.install
 debian/update-notifier-release.conf usr/share/upstart/sessions/
 debian/update-notifier-crash.conf usr/share/upstart/sessions/
 #systemd units
 debian/systemd/update-notifier-crash.path usr/lib/systemd/user
 debian/systemd/update-notifier-crash.service usr/lib/systemd/user
 debian/update-notifier-crash usr/lib/update-notifier/
+<<<<<<< debian/update-notifier.install
+=======
+debian/systemd/unicast-local-avahi.path usr/lib/systemd/user
+debian/systemd/unicast-local-avahi.service usr/lib/systemd/user
+>>>>>>> debian/update-notifier.install
 debian/systemd/update-notifier-release.path usr/lib/systemd/user
 debian/systemd/update-notifier-release.service usr/lib/systemd/user
 debian/systemd/update-notifier-livepatch.path usr/lib/systemd/user
 debian/systemd/update-notifier-livepatch.service usr/lib/systemd/user
 # disable upstart job under systemd sessions
+<<<<<<< debian/update-notifier.install
+=======
+debian/systemd/unicast-local-avahi.override usr/share/upstart/systemd-session/upstart/
+>>>>>>> debian/update-notifier.install
 debian/systemd/update-notifier-crash.override usr/share/upstart/systemd-session/upstart/
 debian/systemd/update-notifier-hp-firmware.override usr/share/upstart/systemd-session/upstart/
 debian/systemd/update-notifier-release.override usr/share/upstart/systemd-session/upstart/
diff --git a/debian/update-notifier.links b/debian/update-notifier.links
index 3cf7f20..c9166ec 100644
--- a/debian/update-notifier.links
+++ b/debian/update-notifier.links
@@ -1,2 +1,6 @@
 usr/lib/systemd/user/update-notifier-crash.path usr/lib/systemd/user/graphical-session.target.wants/update-notifier-crash.path
+<<<<<<< debian/update-notifier.links
+=======
+usr/lib/systemd/user/unicast-local-avahi.path usr/lib/systemd/user/graphical-session.target.wants/unicast-local-avahi.path
+>>>>>>> debian/update-notifier.links
 usr/lib/systemd/user/update-notifier-release.path usr/lib/systemd/user/graphical-session.target.wants/update-notifier-release.path
diff --git a/pixmaps/scalable/livepatch-on.svg b/pixmaps/scalable/livepatch-on.svg
new file mode 100644
index 0000000..b45b682
--- /dev/null
+++ b/pixmaps/scalable/livepatch-on.svg
@@ -0,0 +1 @@
+<svg id="livepatch_-_on" data-name="livepatch - on" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19"><defs><style>.cls-1{fill:none;}.cls-2{fill:#ccc;}.cls-3{fill:#38b44a;}.cls-4{fill:#fff;}</style></defs><title>Artboard 1</title><g id="layer1"><rect id="rect4782" class="cls-1" y="0.13" width="19" height="19"/><path id="path4210" class="cls-2" d="M9.5.52S7.56,3.77,2.38,3.77c0,11.06,7.12,15,7.12,15s7.13-3.9,7.13-15C11.46,3.77,9.5.52,9.5.52Z"/></g><path id="path4155" class="cls-3" d="M13.56,7.59A4.4,4.4,0,1,0,18,12,4.4,4.4,0,0,0,13.56,7.59Z"/><path id="path4041-9" class="cls-4" d="M16,10.12l-2.8,2.46L11.57,11.2l-.3.33,1.92,2,3-3.18Z"/></svg>
\ No newline at end of file
diff --git a/pixmaps/scalable/livepatch-warning.svg b/pixmaps/scalable/livepatch-warning.svg
new file mode 100644
index 0000000..aff7348
--- /dev/null
+++ b/pixmaps/scalable/livepatch-warning.svg
@@ -0,0 +1 @@
+<svg id="livepatch-_warning" data-name="livepatch- warning" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19"><defs><style>.cls-1{fill:none;}.cls-2{fill:#ccc;}.cls-3{fill:#e95420;}.cls-4{fill:#fff;}</style></defs><title>Artboard 1</title><g id="layer1"><rect id="rect4782" class="cls-1" x="-0.03" y="0.09" width="19.07" height="19.07"/><path id="path4210" class="cls-2" d="M9.5.49S7.56,3.75,2.35,3.75c0,11.1,7.15,15,7.15,15s7.16-3.91,7.16-15C11.47,3.75,9.5.49,9.5.49Z"/></g><path id="path4155" class="cls-3" d="M13.56,7.59A4.4,4.4,0,1,0,18,12,4.4,4.4,0,0,0,13.56,7.59Z"/><path id="path4159" class="cls-4" d="M13.06,9.07v.84c0,.54,0,1.05,0,1.51s.07.91.12,1.38h.67q.07-.71.12-1.38c0-.46,0-1,0-1.51V9.07Zm.5,4.84a.63.63,0,0,0-.44.19.57.57,0,0,0-.18.44.61.61,0,0,0,.18.45.66.66,0,0,0,.44.17A.64.64,0,0,0,14,15a.61.61,0,0,0,.18-.45A.57.57,0,0,0,14,14.1.62.62,0,0,0,13.56,13.91Z"/></svg>
\ No newline at end of file
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8c031ac..ebcbac1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,11 +3,18 @@
 # *grumpf* [type=] does not work because intltool-update does not
 # know about anything but the types available in intltool-extract --help
 [type=gettext/Shell] data/notify-reboot-required
+<<<<<<< po/POTFILES.in
 [type=gettext/Shell] data/notify-updates-outdated
+=======
+>>>>>>> po/POTFILES.in
 data/apt_check.py
 data/apt-cdrom-check
 data/cddistupgrader
 src/crash.c
+<<<<<<< po/POTFILES.in
+=======
+src/avahi.c
+>>>>>>> po/POTFILES.in
 src/cdroms.c
 src/hooks.c
 src/livepatch.c
@@ -18,6 +25,9 @@ src/update-notifier.c
 data/com.ubuntu.update-notifier.gschema.xml.in
 data/com.ubuntu.update-notifier.policy.in
 data/update-notifier.desktop.in
+<<<<<<< po/POTFILES.in
 data/ubuntu-advantage-notification.desktop.in
+=======
+>>>>>>> po/POTFILES.in
 [type: gettext/rfc822deb] data/package-data-downloads-failed.in
 [type: gettext/rfc822deb] data/package-data-downloads-failed-permanently.in
diff --git a/po/ace.po b/po/ace.po
index 66df2d9..6dfbdd7 100644
--- a/po/ace.po
+++ b/po/ace.po
@@ -7,7 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-notifier\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< po/ace.po
 "POT-Creation-Date: 2020-11-12 23:53+0000\n"
+=======
+"POT-Creation-Date: 2020-11-19 05:20+0000\n"
+>>>>>>> po/ace.po
 "PO-Revision-Date: 2009-06-02 16:12+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Achinese <[e-mail]>\n"
@@ -34,36 +38,58 @@ msgstr ""
 
 #: ../data/apt_check.py:93
 #, python-format
+<<<<<<< po/ace.po
 msgid "%i update can be installed immediately."
 msgid_plural "%i updates can be installed immediately."
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../data/apt_check.py:101
+=======
+msgid "%i package can be updated."
+msgid_plural "%i packages can be updated."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../data/apt_check.py:99
+>>>>>>> po/ace.po
 #, 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] ""
 
+<<<<<<< po/ace.po
 #: ../data/apt_check.py:110
+=======
+#: ../data/apt_check.py:108
+>>>>>>> po/ace.po
 #, python-format
 msgid "%i of these updates is a security update."
 msgid_plural "%i of these updates are security updates."
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< po/ace.po
 #: ../data/apt_check.py:119
 msgid "To see these additional updates run: apt list --upgradable"
 msgstr ""
 
 #: ../data/apt_check.py:126
+=======
+#: ../data/apt_check.py:117
+msgid "To see these additional updates run: apt list --upgradable"
+msgstr ""
+
+#: ../data/apt_check.py:124
+>>>>>>> po/ace.po
 #, 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] ""
 
+<<<<<<< po/ace.po
 #: ../data/apt_check.py:137
 msgid "Enable UA Infra: ESM to receive additional future security updates."
 msgstr ""
@@ -73,19 +99,39 @@ msgid "See https://ubuntu.com/security/esm or run: sudo ua status"
 msgstr ""
 
 #: ../data/apt_check.py:184
+=======
+#: ../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:182
+>>>>>>> po/ace.po
 #, python-format
 msgid "Error: Opening the cache (%s)"
 msgstr ""
 
+<<<<<<< po/ace.po
 #: ../data/apt_check.py:194
 msgid "Error: BrokenCount > 0"
 msgstr ""
 
 #: ../data/apt_check.py:201
+=======
+#: ../data/apt_check.py:192
+msgid "Error: BrokenCount > 0"
+msgstr ""
+
+#: ../data/apt_check.py:199
+>>>>>>> po/ace.po
 #, python-format
 msgid "Error: Marking the upgrade (%s)"
 msgstr ""
 
+<<<<<<< po/ace.po
 #: ../data/apt_check.py:310
 msgid "Show the packages that are going to be installed/upgraded"
 msgstr ""
@@ -95,6 +141,17 @@ msgid "Show human readable output on stdout"
 msgstr ""
 
 #: ../data/apt_check.py:320
+=======
+#: ../data/apt_check.py:309
+msgid "Show the packages that are going to be installed/upgraded"
+msgstr ""
+
+#: ../data/apt_check.py:315
+msgid "Show human readable output on stdout"
+msgstr ""
+
+#: ../data/apt_check.py:319
+>>>>>>> po/ace.po
 msgid ""
 "Return the time in days when security updates are installed unattended (0 "
 "means disabled)"
@@ -122,6 +179,21 @@ msgid ""
 "notification icon to display details. "
 msgstr ""
 
+<<<<<<< po/ace.po
+=======
+#. Create and show the notification
+#: ../src/avahi.c:16
+msgid "Network service discovery disabled"
+msgstr ""
+
+#: ../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 ""
+
+>>>>>>> po/ace.po
 #: ../src/cdroms.c:48
 msgid "Software Packages Volume Detected"
 msgstr ""
@@ -203,9 +275,14 @@ msgid "No current updates"
 msgstr ""
 
 #: ../src/livepatch-tray.c:148
+<<<<<<< po/ace.po
 #, c-format
 msgid "%zd current update"
 msgid_plural "%zd current updates"
+=======
+msgid "%"
+msgid_plural "%"
+>>>>>>> po/ace.po
 msgstr[0] ""
 msgstr[1] ""
 
@@ -290,20 +367,36 @@ msgstr ""
 msgid "A problem occurred when checking for the updates."
 msgstr ""
 
+<<<<<<< po/ace.po
 #: ../src/update-notifier.c:560
 msgid "- inform about updates"
 msgstr ""
 
 #: ../src/update-notifier.c:562
+=======
+#: ../src/update-notifier.c:585
+msgid "- inform about updates"
+msgstr ""
+
+#: ../src/update-notifier.c:587
+>>>>>>> po/ace.po
 #, c-format
 msgid "Failed to init the UI: %s\n"
 msgstr ""
 
+<<<<<<< po/ace.po
 #: ../src/update-notifier.c:563
 msgid "unknown error"
 msgstr ""
 
 #: ../src/update-notifier.c:590
+=======
+#: ../src/update-notifier.c:588
+msgid "unknown error"
+msgstr ""
+
+#: ../src/update-notifier.c:615
+>>>>>>> po/ace.po
 msgid "update-notifier"
 msgstr ""
 
diff --git a/po/af.po b/po/af.po
index b89dc92..752e8b5 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,7 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-notifier\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< po/af.po
 "POT-Creation-Date: 2020-11-12 23:53+0000\n"
+=======
+"POT-Creation-Date: 2020-11-19 05:20+0000\n"
+>>>>>>> po/af.po
 "PO-Revision-Date: 2012-09-06 08:22+0000\n"
 "Last-Translator: Dawid de Jager <[e-mail]>\n"
 "Language-Team: Afrikaans <[e-mail]>\n"
@@ -33,6 +37,7 @@ msgid "UA Infra: Extended Security Maintenance (ESM) is not enabled."
 msgstr ""
 
 #: ../data/apt_check.py:93
+<<<<<<< po/af.po
 #, fuzzy, python-format
 msgid "%i update can be installed immediately."
 msgid_plural "%i updates can be installed immediately."
@@ -40,30 +45,52 @@ msgstr[0] "%i bywerking is 'n veiligheidsopdatering."
 msgstr[1] "%i bywerkings is veiligheidsopdaterings."
 
 #: ../data/apt_check.py:101
+=======
+#, 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:99
+>>>>>>> po/af.po
 #, 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] ""
 
+<<<<<<< po/af.po
 #: ../data/apt_check.py:110
+=======
+#: ../data/apt_check.py:108
+>>>>>>> po/af.po
 #, 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."
 
+<<<<<<< po/af.po
 #: ../data/apt_check.py:119
 msgid "To see these additional updates run: apt list --upgradable"
 msgstr ""
 
 #: ../data/apt_check.py:126
+=======
+#: ../data/apt_check.py:117
+msgid "To see these additional updates run: apt list --upgradable"
+msgstr ""
+
+#: ../data/apt_check.py:124
+>>>>>>> po/af.po
 #, 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] ""
 
+<<<<<<< po/af.po
 #: ../data/apt_check.py:137
 msgid "Enable UA Infra: ESM to receive additional future security updates."
 msgstr ""
@@ -73,19 +100,39 @@ msgid "See https://ubuntu.com/security/esm or run: sudo ua status"
 msgstr ""
 
 #: ../data/apt_check.py:184
+=======
+#: ../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:182
+>>>>>>> po/af.po
 #, python-format
 msgid "Error: Opening the cache (%s)"
 msgstr "Fout: oopmaak van kas (%s)"
 
+<<<<<<< po/af.po
 #: ../data/apt_check.py:194
 msgid "Error: BrokenCount > 0"
 msgstr "Fout: BrokenCount > 0"
 
 #: ../data/apt_check.py:201
+=======
+#: ../data/apt_check.py:192
+msgid "Error: BrokenCount > 0"
+msgstr "Fout: BrokenCount > 0"
+
+#: ../data/apt_check.py:199
+>>>>>>> po/af.po
 #, python-format
 msgid "Error: Marking the upgrade (%s)"
 msgstr "Fout: Merk van opgradering (%s)"
 
+<<<<<<< po/af.po
 #: ../data/apt_check.py:310
 msgid "Show the packages that are going to be installed/upgraded"
 msgstr "Wys die pakkette wat geïnstalleer of opgradeer gaan word"
@@ -95,6 +142,17 @@ msgid "Show human readable output on stdout"
 msgstr "Vertoon gemaklik leesbare uitvoer op stdout"
 
 #: ../data/apt_check.py:320
+=======
+#: ../data/apt_check.py:309
+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:315
+msgid "Show human readable output on stdout"
+msgstr "Vertoon gemaklik leesbare uitvoer op stdout"
+
+#: ../data/apt_check.py:319
+>>>>>>> po/af.po
 msgid ""
 "Return the time in days when security updates are installed unattended (0 "
 "means disabled)"
@@ -126,6 +184,24 @@ msgstr ""
 "'n Program op u rekenaar het onlangs homself vasgeloop. Kliek op die "
 "kennisgewing-afbeelding om meer besonderhede te bekom. "
 
+<<<<<<< po/af.po
+=======
+#. Create and show the notification
+#: ../src/avahi.c:16
+msgid "Network service discovery disabled"
+msgstr "Die ontdekking van netwerkdienste is afgeskakel"
+
+#: ../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 ""
+"U huidige netwerk het 'n .local domein. Dit word nie aanbeveel nie en is nie "
+"bruikbaar met die Avahi-netwerkdiensdetektor nie. Die diens is daarom "
+"afgeskakel."
+
+>>>>>>> po/af.po
 #: ../src/cdroms.c:48
 msgid "Software Packages Volume Detected"
 msgstr "Skyf met sagtewarepakkette gevind"
@@ -221,9 +297,14 @@ msgid "No current updates"
 msgstr "-informeer oor opdaterings"
 
 #: ../src/livepatch-tray.c:148
+<<<<<<< po/af.po
 #, c-format
 msgid "%zd current update"
 msgid_plural "%zd current updates"
+=======
+msgid "%"
+msgid_plural "%"
+>>>>>>> po/af.po
 msgstr[0] ""
 msgstr[1] ""
 
@@ -327,20 +408,36 @@ msgstr ""
 msgid "A problem occurred when checking for the updates."
 msgstr "'n Probleem het ontstaan by die kontrolering van opdaterings"
 
+<<<<<<< po/af.po
 #: ../src/update-notifier.c:560
 msgid "- inform about updates"
 msgstr "-informeer oor opdaterings"
 
 #: ../src/update-notifier.c:562
+=======
+#: ../src/update-notifier.c:585
+msgid "- inform about updates"
+msgstr "-informeer oor opdaterings"
+
+#: ../src/update-notifier.c:587
+>>>>>>> po/af.po
 #, c-format
 msgid "Failed to init the UI: %s\n"
 msgstr "Gebruikerskoppelvlak-inisialisering het misluk: %s\n"
 
+<<<<<<< po/af.po
 #: ../src/update-notifier.c:563
 msgid "unknown error"
 msgstr "onbekende fout"
 
 #: ../src/update-notifier.c:590
+=======
+#: ../src/update-notifier.c:588
+msgid "unknown error"
+msgstr "onbekende fout"
+
+#: ../src/update-notifier.c:615
+>>>>>>> po/af.po
 msgid "update-notifier"
 msgstr "opdateringskennisgewing"
 
@@ -411,11 +508,14 @@ msgstr ""
 "maak en dan die pakkette verwyder en weer installeer om die probleem reg te "
 "maak."
 
+<<<<<<< po/af.po
 #~ 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"
 
+=======
+>>>>>>> po/af.po
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">Please enter your password to "
 #~ "access problem reports of system programs</span>"
@@ -423,6 +523,7 @@ msgstr ""
 #~ "<span weight=\"bold\" size=\"larger\">Verskaf asseblief u wagwoord om "
 #~ "foutverslae van u stelselprogramme te kan bekom</span>"
 
+<<<<<<< po/af.po
 #~ msgid "Network service discovery disabled"
 #~ msgstr "Die ontdekking van netwerkdienste is afgeskakel"
 
@@ -435,6 +536,8 @@ msgstr ""
 #~ "nie bruikbaar met die Avahi-netwerkdiensdetektor nie. Die diens is daarom "
 #~ "afgeskakel."
 
+=======
+>>>>>>> po/af.po
 #~ msgid "Addon volume detected"
 #~ msgstr "Aanvullende volume gevind"
 
diff --git a/po/am.po b/po/am.po
index 7c76446..ee21ce1 100644
--- a/po/am.po
+++ b/po/am.po
@@ -7,7 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-notifier\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< po/am.po
 "POT-Creation-Date: 2020-11-12 23:53+0000\n"
+=======
+"POT-Creation-Date: 2020-11-19 05:20+0000\n"
+>>>>>>> po/am.po
 "PO-Revision-Date: 2012-10-29 01:19+0000\n"
 "Last-Translator: samson <Unknown>\n"
 "Language-Team: Amharic <[e-mail]>\n"
@@ -33,6 +37,7 @@ msgid "UA Infra: Extended Security Maintenance (ESM) is not enabled."
 msgstr ""
 
 #: ../data/apt_check.py:93
+<<<<<<< po/am.po
 #, fuzzy, python-format
 msgid "%i update can be installed immediately."
 msgid_plural "%i updates can be installed immediately."
@@ -40,30 +45,52 @@ msgstr[0] "%i ማሻሻያው የደህንነት ማሻሻያ ነው"
 msgstr[1] "%i ማሻሻያዎቹ የደህንነት ማሻሻያዎች ናቸው"
 
 #: ../data/apt_check.py:101
+=======
+#, 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:99
+>>>>>>> po/am.po
 #, 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] ""
 
+<<<<<<< po/am.po
 #: ../data/apt_check.py:110
+=======
+#: ../data/apt_check.py:108
+>>>>>>> po/am.po
 #, 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 ማሻሻያዎቹ የደህንነት ማሻሻያዎች ናቸው"
 
+<<<<<<< po/am.po
 #: ../data/apt_check.py:119
 msgid "To see these additional updates run: apt list --upgradable"
 msgstr ""
 
 #: ../data/apt_check.py:126
+=======
+#: ../data/apt_check.py:117
+msgid "To see these additional updates run: apt list --upgradable"
+msgstr ""
+
+#: ../data/apt_check.py:124
+>>>>>>> po/am.po
 #, 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] ""
 
+<<<<<<< po/am.po
 #: ../data/apt_check.py:137
 msgid "Enable UA Infra: ESM to receive additional future security updates."
 msgstr ""
@@ -73,19 +100,39 @@ msgid "See https://ubuntu.com/security/esm or run: sudo ua status"
 msgstr ""
 
 #: ../data/apt_check.py:184
+=======
+#: ../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:182
+>>>>>>> po/am.po
 #, python-format
 msgid "Error: Opening the cache (%s)"
 msgstr "ስህተት: ካሽን (%s) በመክፈት ላይ"
 
+<<<<<<< po/am.po
 #: ../data/apt_check.py:194
 msgid "Error: BrokenCount > 0"
 msgstr "ስህተት: የተሰበሩትን በመቁጠር > 0"
 
 #: ../data/apt_check.py:201
+=======
+#: ../data/apt_check.py:192
+msgid "Error: BrokenCount > 0"
+msgstr "ስህተት: የተሰበሩትን በመቁጠር > 0"
+
+#: ../data/apt_check.py:199
+>>>>>>> po/am.po
 #, python-format
 msgid "Error: Marking the upgrade (%s)"
 msgstr "ስህተት ማሻሻያውን ምልክት  በማድረግ ላይ (%s)"
 
+<<<<<<< po/am.po
 #: ../data/apt_check.py:310
 msgid "Show the packages that are going to be installed/upgraded"
 msgstr "ማሳየት ጥቅሎችን የሚሻሻሉትን/የሚገጠሙትን"
@@ -95,6 +142,17 @@ msgid "Show human readable output on stdout"
 msgstr ""
 
 #: ../data/apt_check.py:320
+=======
+#: ../data/apt_check.py:309
+msgid "Show the packages that are going to be installed/upgraded"
+msgstr "ማሳየት ጥቅሎችን የሚሻሻሉትን/የሚገጠሙትን"
+
+#: ../data/apt_check.py:315
+msgid "Show human readable output on stdout"
+msgstr ""
+
+#: ../data/apt_check.py:319
+>>>>>>> po/am.po
 msgid ""
 "Return the time in days when security updates are installed unattended (0 "
 "means disabled)"
@@ -122,6 +180,21 @@ msgid ""
 "notification icon to display details. "
 msgstr ""
 
+<<<<<<< po/am.po
+=======
+#. Create and show the notification
+#: ../src/avahi.c:16
+msgid "Network service discovery disabled"
+msgstr ""
+
+#: ../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 ""
+
+>>>>>>> po/am.po
 #: ../src/cdroms.c:48
 msgid "Software Packages Volume Detected"
 msgstr "የሶፍትዌር ጥቅል መጠን ተገኝቷል"
@@ -204,9 +277,14 @@ msgid "No current updates"
 msgstr "- ማሳወቅ ስለ ማሻሻያው"
 
 #: ../src/livepatch-tray.c:148
+<<<<<<< po/am.po
 #, c-format
 msgid "%zd current update"
 msgid_plural "%zd current updates"
+=======
+msgid "%"
+msgid_plural "%"
+>>>>>>> po/am.po
 msgstr[0] ""
 msgstr[1] ""
 
@@ -293,20 +371,36 @@ msgstr "እንደተለመደው ይህ የተተከሉት ጥቅሎች ደጋ
 msgid "A problem occurred when checking for the updates."
 msgstr "ስህተት ተፈጥሯል ማሻሻያ በሚፈለገበት ጊዜ"
 
+<<<<<<< po/am.po
 #: ../src/update-notifier.c:560
 msgid "- inform about updates"
 msgstr "- ማሳወቅ ስለ ማሻሻያው"
 
 #: ../src/update-notifier.c:562
+=======
+#: ../src/update-notifier.c:585
+msgid "- inform about updates"
+msgstr "- ማሳወቅ ስለ ማሻሻያው"
+
+#: ../src/update-notifier.c:587
+>>>>>>> po/am.po
 #, c-format
 msgid "Failed to init the UI: %s\n"
 msgstr ""
 
+<<<<<<< po/am.po
 #: ../src/update-notifier.c:563
 msgid "unknown error"
 msgstr "ያልታወቀ ስህተት"
 
 #: ../src/update-notifier.c:590
+=======
+#: ../src/update-notifier.c:588
+msgid "unknown error"
+msgstr "ያልታወቀ ስህተት"
+
+#: ../src/update-notifier.c:615
+>>>>>>> po/am.po
 msgid "update-notifier"
 msgstr "ማሻሻያ-አሳዋቂ"
 
@@ -369,11 +463,14 @@ msgid ""
 "reinstall the packages to fix this problem."
 msgstr ""
 
+<<<<<<< po/am.po
 #~ msgid "%i package can be updated."
 #~ msgid_plural "%i packages can be updated."
 #~ msgstr[0] "%i ጥቅሉን ማሻሻል ይቻላል"
 #~ msgstr[1] "%i ጥቅሎቹን ማሻሻል ይቻላል"
 
+=======
+>>>>>>> po/am.po
 #~ msgid "System restart required"
 #~ msgstr "ስርዓቱን እንደገና መጀመር ይስፈልጋል"
 
diff --git a/po/an.po b/po/an.po
index 36995f6..3a239ad 100644
--- a/po/an.po
+++ b/po/an.po
@@ -7,7 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-notifier\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< po/an.po
 "POT-Creation-Date: 2020-11-12 23:53+0000\n"
+=======
+"POT-Creation-Date: 2020-11-19 05:20+0000\n"
+>>>>>>> po/an.po
 "PO-Revision-Date: 2011-05-04 11:57+0000\n"
 "Last-Translator: Daniel Martinez <[e-mail]>\n"
 "Language-Team: Aragonese <[e-mail]>\n"
@@ -33,6 +37,7 @@ msgid "UA Infra: Extended Security Maintenance (ESM) is not enabled."
 msgstr ""
 
 #: ../data/apt_check.py:93
+<<<<<<< po/an.po
 #, fuzzy, python-format
 msgid "%i update can be installed immediately."
 msgid_plural "%i updates can be installed immediately."
@@ -40,30 +45,52 @@ msgstr[0] "%i esvielle ye de seguridat."
 msgstr[1] "%i esvielles son de seguridat."
 
 #: ../data/apt_check.py:101
+=======
+#, 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:99
+>>>>>>> po/an.po
 #, 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] ""
 
+<<<<<<< po/an.po
 #: ../data/apt_check.py:110
+=======
+#: ../data/apt_check.py:108
+>>>>>>> po/an.po
 #, 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."
 
+<<<<<<< po/an.po
 #: ../data/apt_check.py:119
 msgid "To see these additional updates run: apt list --upgradable"
 msgstr ""
 
 #: ../data/apt_check.py:126
+=======
+#: ../data/apt_check.py:117
+msgid "To see these additional updates run: apt list --upgradable"
+msgstr ""
+
+#: ../data/apt_check.py:124
+>>>>>>> po/an.po
 #, 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] ""
 
+<<<<<<< po/an.po
 #: ../data/apt_check.py:137
 msgid "Enable UA Infra: ESM to receive additional future security updates."
 msgstr ""
@@ -73,19 +100,39 @@ msgid "See https://ubuntu.com/security/esm or run: sudo ua status"
 msgstr ""
 
 #: ../data/apt_check.py:184
+=======
+#: ../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:182
+>>>>>>> po/an.po
 #, python-format
 msgid "Error: Opening the cache (%s)"
 msgstr "Error: Ubriendo la caché (%s)"
 
+<<<<<<< po/an.po
 #: ../data/apt_check.py:194
 msgid "Error: BrokenCount > 0"
 msgstr "Error: BrokenCount > 0"
 
 #: ../data/apt_check.py:201
+=======
+#: ../data/apt_check.py:192
+msgid "Error: BrokenCount > 0"
+msgstr "Error: BrokenCount > 0"
+
+#: ../data/apt_check.py:199
+>>>>>>> po/an.po
 #, python-format
 msgid "Error: Marking the upgrade (%s)"
 msgstr "Error: Marcando l'esvielle (%s)"
 
+<<<<<<< po/an.po
 #: ../data/apt_check.py:310
 msgid "Show the packages that are going to be installed/upgraded"
 msgstr "Amostra los paquetes que van a estar instalaus u esviellaus"
@@ -95,6 +142,17 @@ msgid "Show human readable output on stdout"
 msgstr "Amuestra una surtida leyible ta humans por stdout"
 
 #: ../data/apt_check.py:320
+=======
+#: ../data/apt_check.py:309
+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:315
+msgid "Show human readable output on stdout"
+msgstr "Amuestra una surtida leyible ta humans por stdout"
+
+#: ../data/apt_check.py:319
+>>>>>>> po/an.po
 msgid ""
 "Return the time in days when security updates are installed unattended (0 "
 "means disabled)"
@@ -124,6 +182,21 @@ msgid ""
 "notification icon to display details. "
 msgstr ""
 
+<<<<<<< po/an.po
+=======
+#. Create and show the notification
+#: ../src/avahi.c:16
+msgid "Network service discovery disabled"
+msgstr "Servicio d'autodetección de rete desactivau"
+
+#: ../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 ""
+
+>>>>>>> po/an.po
 #: ../src/cdroms.c:48
 msgid "Software Packages Volume Detected"
 msgstr "Volumen de paquetz de software detectau"
@@ -207,9 +280,14 @@ msgid "No current updates"
 msgstr "Amostrar esvielles"
 
 #: ../src/livepatch-tray.c:148
+<<<<<<< po/an.po
 #, c-format
 msgid "%zd current update"
 msgid_plural "%zd current updates"
+=======
+msgid "%"
+msgid_plural "%"
+>>>>>>> po/an.po
 msgstr[0] ""
 msgstr[1] ""
 
@@ -298,20 +376,36 @@ msgstr ""
 msgid "A problem occurred when checking for the updates."
 msgstr ""
 
+<<<<<<< po/an.po
 #: ../src/update-notifier.c:560
 msgid "- inform about updates"
 msgstr ""
 
 #: ../src/update-notifier.c:562
+=======
+#: ../src/update-notifier.c:585
+msgid "- inform about updates"
+msgstr ""
+
+#: ../src/update-notifier.c:587
+>>>>>>> po/an.po
 #, c-format
 msgid "Failed to init the UI: %s\n"
 msgstr ""
 
+<<<<<<< po/an.po
 #: ../src/update-notifier.c:563
 msgid "unknown error"
 msgstr "error desconoxiu"
 
 #: ../src/update-notifier.c:590
+=======
+#: ../src/update-notifier.c:588
+msgid "unknown error"
+msgstr "error desconoxiu"
+
+#: ../src/update-notifier.c:615
+>>>>>>> po/an.po
 msgid "update-notifier"
 msgstr "Notificador d'esvielles"
 
@@ -374,11 +468,14 @@ msgid ""
 "reinstall the packages to fix this problem."
 msgstr ""
 
+<<<<<<< po/an.po
 #~ 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."
 
+=======
+>>>>>>> po/an.po
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">Please enter your password to "
 #~ "access problem reports of system programs</span>"
@@ -386,9 +483,12 @@ msgstr ""
 #~ "<span weight=\"bold\" size=\"larger\">Meta o suya clau de paso ta acceder "
 #~ "a os informes d'os programas d'o sistema</span>"
 
+<<<<<<< po/an.po
 #~ msgid "Network service discovery disabled"
 #~ msgstr "Servicio d'autodetección de rete desactivau"
 
+=======
+>>>>>>> po/an.po
 #~ msgid "Addon volume detected"
 #~ msgstr "S'ha detectau un disco suplementario"
 
diff --git a/po/ar.po b/po/ar.po
index affc920..7c8fa7c 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -10,7 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: po_update-notifier-ar\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< po/ar.po
 "POT-Creation-Date: 2020-11-12 23:53+0000\n"
+=======
+"POT-Creation-Date: 2020-11-19 05:20+0000\n"
+>>>>>>> po/ar.po
 "PO-Revision-Date: 2012-09-06 02:40+0000\n"
 "Last-Translator: Ibrahim Saed <[e-mail]>\n"
 "Language-Team: Arabic\n"
@@ -37,6 +41,7 @@ msgid "UA Infra: Extended Security Maintenance (ESM) is not enabled."
 msgstr ""
 
 #: ../data/apt_check.py:93
+<<<<<<< po/ar.po
 #, fuzzy, python-format
 msgid "%i update can be installed immediately."
 msgid_plural "%i updates can be installed immediately."
@@ -48,6 +53,19 @@ msgstr[4] "%i تحديثا أمنيا."
 msgstr[5] "%i تحديث أمنيا."
 
 #: ../data/apt_check.py:101
+=======
+#, python-format
+msgid "%i package can be updated."
+msgid_plural "%i packages can be updated."
+msgstr[0] "لا حزم يمكن تحديثها."
+msgstr[1] "حزمة واحدة يمكن تحديثها."
+msgstr[2] "حزمتان يمكن تحديثهما."
+msgstr[3] "%i حزم يمكن تحديثها."
+msgstr[4] "%i حزمة يمكن تحديثها."
+msgstr[5] "%i حزمة يمكن تحديثها."
+
+#: ../data/apt_check.py:99
+>>>>>>> po/ar.po
 #, 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."
@@ -58,7 +76,11 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
+<<<<<<< po/ar.po
 #: ../data/apt_check.py:110
+=======
+#: ../data/apt_check.py:108
+>>>>>>> po/ar.po
 #, fuzzy, python-format
 msgid "%i of these updates is a security update."
 msgid_plural "%i of these updates are security updates."
@@ -69,11 +91,19 @@ msgstr[3] "%i تحديثات أمنية."
 msgstr[4] "%i تحديثا أمنيا."
 msgstr[5] "%i تحديث أمنيا."
 
+<<<<<<< po/ar.po
 #: ../data/apt_check.py:119
 msgid "To see these additional updates run: apt list --upgradable"
 msgstr ""
 
 #: ../data/apt_check.py:126
+=======
+#: ../data/apt_check.py:117
+msgid "To see these additional updates run: apt list --upgradable"
+msgstr ""
+
+#: ../data/apt_check.py:124
+>>>>>>> po/ar.po
 #, 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."
@@ -84,6 +114,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
+<<<<<<< po/ar.po
 #: ../data/apt_check.py:137
 msgid "Enable UA Infra: ESM to receive additional future security updates."
 msgstr ""
@@ -93,19 +124,39 @@ msgid "See https://ubuntu.com/security/esm or run: sudo ua status"
 msgstr ""
 
 #: ../data/apt_check.py:184
+=======
+#: ../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:182
+>>>>>>> po/ar.po
 #, python-format
 msgid "Error: Opening the cache (%s)"
 msgstr "خطأ: فتح الخبيئة (%s)"
 
+<<<<<<< po/ar.po
 #: ../data/apt_check.py:194
 msgid "Error: BrokenCount > 0"
 msgstr "خطأ: عداد الانكسار > 0"
 
 #: ../data/apt_check.py:201
+=======
+#: ../data/apt_check.py:192
+msgid "Error: BrokenCount > 0"
+msgstr "خطأ: عداد الانكسار > 0"
+
+#: ../data/apt_check.py:199
+>>>>>>> po/ar.po
 #, python-format
 msgid "Error: Marking the upgrade (%s)"
 msgstr "خطأ: تعليم الترقية (%s)"
 
+<<<<<<< po/ar.po
 #: ../data/apt_check.py:310
 msgid "Show the packages that are going to be installed/upgraded"
 msgstr "أظهر الحزم التي ستثبت/سترقّى"
@@ -115,6 +166,17 @@ msgid "Show human readable output on stdout"
 msgstr "أظهر مخرج مقروء من البشر على stdout"
 
 #: ../data/apt_check.py:320
+=======
+#: ../data/apt_check.py:309
+msgid "Show the packages that are going to be installed/upgraded"
+msgstr "أظهر الحزم التي ستثبت/سترقّى"
+
+#: ../data/apt_check.py:315
+msgid "Show human readable output on stdout"
+msgstr "أظهر مخرج مقروء من البشر على stdout"
+
+#: ../data/apt_check.py:319
+>>>>>>> po/ar.po
 msgid ""
 "Return the time in days when security updates are installed unattended (0 "
 "means disabled)"
@@ -144,6 +206,23 @@ msgstr ""
 "انهار تطبيق في النظام (للتو أو سابقا). انقر على أيقونة التبليغ لتطالع "
 "التفاصيل. "
 
+<<<<<<< po/ar.po
+=======
+#. Create and show the notification
+#: ../src/avahi.c:16
+msgid "Network service discovery disabled"
+msgstr "عُطِّل استكشاف خدمة الشبكة"
+
+#: ../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 ""
+"لشبكتك الحالية نطاق .local، وهو ما لا ينصح به وليس متوافقا مع استكشاف خدمة "
+"الشبكة Avahi. عُطِّلت الخدمة."
+
+>>>>>>> po/ar.po
 #: ../src/cdroms.c:48
 msgid "Software Packages Volume Detected"
 msgstr "حجوم حزم البرمجيات اكتشفت"
@@ -237,9 +316,14 @@ msgid "No current updates"
 msgstr "- أبلغ بالتحديثات"
 
 #: ../src/livepatch-tray.c:148
+<<<<<<< po/ar.po
 #, c-format
 msgid "%zd current update"
 msgid_plural "%zd current updates"
+=======
+msgid "%"
+msgid_plural "%"
+>>>>>>> po/ar.po
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -352,20 +436,36 @@ msgstr "يعني هذا غالبا أن حزمك المثبتة تنقصها ا
 msgid "A problem occurred when checking for the updates."
 msgstr "طرأت مشكلة أثناء التماس تحديثات."
 
+<<<<<<< po/ar.po
 #: ../src/update-notifier.c:560
 msgid "- inform about updates"
 msgstr "- أبلغ بالتحديثات"
 
 #: ../src/update-notifier.c:562
+=======
+#: ../src/update-notifier.c:585
+msgid "- inform about updates"
+msgstr "- أبلغ بالتحديثات"
+
+#: ../src/update-notifier.c:587
+>>>>>>> po/ar.po
 #, c-format
 msgid "Failed to init the UI: %s\n"
 msgstr "فشل بدء واجهة الاستخدام: %s\n"
 
+<<<<<<< po/ar.po
 #: ../src/update-notifier.c:563
 msgid "unknown error"
 msgstr "خطأ مجهول"
 
 #: ../src/update-notifier.c:590
+=======
+#: ../src/update-notifier.c:588
+msgid "unknown error"
+msgstr "خطأ مجهول"
+
+#: ../src/update-notifier.c:615
+>>>>>>> po/ar.po
 msgid "update-notifier"
 msgstr "update-notifier"
 
@@ -434,6 +534,7 @@ msgstr ""
 "هذا فشل دائم سيترك هذه الحزم غير صالحة للاستخدام على نظامك. قد تكون بحاجة "
 "لإصلاح اتصالك بالإنترنت، ثم أزِل وأعد تثبيت الحزم لإصلاح هذه المشكلة."
 
+<<<<<<< po/ar.po
 #~ msgid "%i package can be updated."
 #~ msgid_plural "%i packages can be updated."
 #~ msgstr[0] "لا حزم يمكن تحديثها."
@@ -443,6 +544,8 @@ msgstr ""
 #~ msgstr[4] "%i حزمة يمكن تحديثها."
 #~ msgstr[5] "%i حزمة يمكن تحديثها."
 
+=======
+>>>>>>> po/ar.po
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">Please enter your password to "
 #~ "access problem reports of system programs</span>"
@@ -450,6 +553,7 @@ msgstr ""
 #~ "<span weight=\"bold\" size=\"larger\">من فضلك أدخل كلمة السر لتَنفُذ إلى "
 #~ "الإبلاغ عن أعطال برمجيات النظام</span>"
 
+<<<<<<< po/ar.po
 #~ msgid "Network service discovery disabled"
 #~ msgstr "عُطِّل استكشاف خدمة الشبكة"
 
@@ -461,6 +565,8 @@ msgstr ""
 #~ "لشبكتك الحالية نطاق .local، وهو ما لا ينصح به وليس متوافقا مع استكشاف "
 #~ "خدمة الشبكة Avahi. عُطِّلت الخدمة."
 
+=======
+>>>>>>> po/ar.po
 #~ msgid "Addon volume detected"
 #~ msgstr "يوجد مجلد ملحقات"
 
diff --git a/po/ast.po b/po/ast.po
index 816fc11..5d4165a 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -7,7 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-notifier\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< po/ast.po
 "POT-Creation-Date: 2020-11-12 23:53+0000\n"
+=======
+"POT-Creation-Date: 2020-11-19 05:20+0000\n"
+>>>>>>> po/ast.po
 "PO-Revision-Date: 2012-10-09 19:59+0000\n"
 "Last-Translator: Colin Watson <[e-mail]>\n"
 "Language-Team: Asturian <[e-mail]>\n"
@@ -33,6 +37,7 @@ msgid "UA Infra: Extended Security Maintenance (ESM) is not enabled."
 msgstr ""
 
 #: ../data/apt_check.py:93
+<<<<<<< po/ast.po
 #, fuzzy, python-format
 msgid "%i update can be installed immediately."
 msgid_plural "%i updates can be installed immediately."
@@ -40,30 +45,52 @@ msgstr[0] "l'anovamientu %i ye un anovamientu de seguridá."
 msgstr[1] "los anovamientos %i son anovamientos de seguridá"
 
 #: ../data/apt_check.py:101
+=======
+#, 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:99
+>>>>>>> po/ast.po
 #, 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] ""
 
+<<<<<<< po/ast.po
 #: ../data/apt_check.py:110
+=======
+#: ../data/apt_check.py:108
+>>>>>>> po/ast.po
 #, 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á"
 
+<<<<<<< po/ast.po
 #: ../data/apt_check.py:119
 msgid "To see these additional updates run: apt list --upgradable"
 msgstr ""
 
 #: ../data/apt_check.py:126
+=======
+#: ../data/apt_check.py:117
+msgid "To see these additional updates run: apt list --upgradable"
+msgstr ""
+
+#: ../data/apt_check.py:124
+>>>>>>> po/ast.po
 #, 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] ""
 
+<<<<<<< po/ast.po
 #: ../data/apt_check.py:137
 msgid "Enable UA Infra: ESM to receive additional future security updates."
 msgstr ""
@@ -73,19 +100,39 @@ msgid "See https://ubuntu.com/security/esm or run: sudo ua status"
 msgstr ""
 
 #: ../data/apt_check.py:184
+=======
+#: ../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:182
+>>>>>>> po/ast.po
 #, python-format
 msgid "Error: Opening the cache (%s)"
 msgstr "Fallu: Abriendo la caché (%s)"
 
+<<<<<<< po/ast.po
 #: ../data/apt_check.py:194
 msgid "Error: BrokenCount > 0"
 msgstr "Fallu: BrokenCount > 0"
 
 #: ../data/apt_check.py:201
+=======
+#: ../data/apt_check.py:192
+msgid "Error: BrokenCount > 0"
+msgstr "Fallu: BrokenCount > 0"
+
+#: ../data/apt_check.py:199
+>>>>>>> po/ast.po
 #, python-format
 msgid "Error: Marking the upgrade (%s)"
 msgstr "Fallu: Marcando l'actualización (%s)"
 
+<<<<<<< po/ast.po
 #: ../data/apt_check.py:310
 msgid "Show the packages that are going to be installed/upgraded"
 msgstr "Amuesa los paquetes que van ser instalaos o actualizaos"
@@ -95,6 +142,17 @@ msgid "Show human readable output on stdout"
 msgstr "Amuesa una salida llexible pa humanos en stdout"
 
 #: ../data/apt_check.py:320
+=======
+#: ../data/apt_check.py:309
+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:315
+msgid "Show human readable output on stdout"
+msgstr "Amuesa una salida llexible pa humanos en stdout"
+
+#: ../data/apt_check.py:319
+>>>>>>> po/ast.po
 msgid ""
 "Return the time in days when security updates are installed unattended (0 "
 "means disabled)"
@@ -126,6 +184,23 @@ msgstr ""
 "Una aplicación quedo colingada nel so sistema (agora o nel pasáu). Calque "
 "sobro l'iconu de notificación p'amosar más detais. "
 
+<<<<<<< po/ast.po
+=======
+#. Create and show the notification
+#: ../src/avahi.c:16
+msgid "Network service discovery disabled"
+msgstr "Serviciu d'autodeteición de rede deshabilitáu"
+
+#: ../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 ""
+"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"
+
+>>>>>>> po/ast.po
 #: ../src/cdroms.c:48
 msgid "Software Packages Volume Detected"
 msgstr "Volume de paquetes de software deteutaos"
@@ -221,9 +296,14 @@ msgid "No current updates"
 msgstr "- informar sobro los anovamientos"
 
 #: ../src/livepatch-tray.c:148
+<<<<<<< po/ast.po
 #, c-format
 msgid "%zd current update"
 msgid_plural "%zd current updates"
+=======
+msgid "%"
+msgid_plural "%"
+>>>>>>> po/ast.po
 msgstr[0] ""
 msgstr[1] ""
 
@@ -326,20 +406,36 @@ msgstr ""
 msgid "A problem occurred when checking for the updates."
 msgstr "Hebo un problema al comprobar les actualizaciones."
 
+<<<<<<< po/ast.po
 #: ../src/update-notifier.c:560
 msgid "- inform about updates"
 msgstr "- informar sobro los anovamientos"
 
 #: ../src/update-notifier.c:562
+=======
+#: ../src/update-notifier.c:585
+msgid "- inform about updates"
+msgstr "- informar sobro los anovamientos"
+
+#: ../src/update-notifier.c:587
+>>>>>>> po/ast.po
 #, c-format
 msgid "Failed to init the UI: %s\n"
 msgstr "Falló al anicializar la interface d'usuariu: %s\n"
 
+<<<<<<< po/ast.po
 #: ../src/update-notifier.c:563
 msgid "unknown error"
 msgstr "fallu desconocíu"
 
 #: ../src/update-notifier.c:590
+=======
+#: ../src/update-notifier.c:588
+msgid "unknown error"
+msgstr "fallu desconocíu"
+
+#: ../src/update-notifier.c:615
+>>>>>>> po/ast.po
 msgid "update-notifier"
 msgstr "notificador-d'anovamientos"
 
@@ -410,11 +506,14 @@ msgstr ""
 "sistema. Pues necesitar configurar la to conexón a Internet, dempués "
 "desaniciar y reinstalar los paquetes pa iguar esti problema."
 
+<<<<<<< po/ast.po
 #~ 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."
 
+=======
+>>>>>>> po/ast.po
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">Please enter your password to "
 #~ "access problem reports of system programs</span>"
@@ -422,6 +521,7 @@ msgstr ""
 #~ "<span weight=\"bold\" size=\"larger\">Introduz la contraseña p'acceder a "
 #~ "los informes de problemes de los programes del sistema</span>"
 
+<<<<<<< po/ast.po
 #~ msgid "Network service discovery disabled"
 #~ msgstr "Serviciu d'autodeteición de rede deshabilitáu"
 
@@ -433,6 +533,8 @@ 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"
 
+=======
+>>>>>>> po/ast.po
 #~ msgid "Addon volume detected"
 #~ msgstr "Discu suplementariu deteutáu"
 
diff --git a/po/az.po b/po/az.po
index e32152f..f1fd5b8 100644
--- a/po/az.po
+++ b/po/az.po
@@ -7,7 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-notifier\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< po/az.po
 "POT-Creation-Date: 2020-11-12 23:53+0000\n"
+=======
+"POT-Creation-Date: 2020-11-19 05:20+0000\n"
+>>>>>>> po/az.po
 "PO-Revision-Date: 2012-05-14 15:24+0000\n"
 "Last-Translator: Arzu Huseynov <[e-mail]>\n"
 "Language-Team: Azerbaijani <[e-mail]>\n"
@@ -34,36 +38,58 @@ msgstr ""
 
 #: ../data/apt_check.py:93
 #, python-format
+<<<<<<< po/az.po
 msgid "%i update can be installed immediately."
 msgid_plural "%i updates can be installed immediately."
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../data/apt_check.py:101
+=======
+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:99
+>>>>>>> po/az.po
 #, 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] ""
 
+<<<<<<< po/az.po
 #: ../data/apt_check.py:110
+=======
+#: ../data/apt_check.py:108
+>>>>>>> po/az.po
 #, python-format
 msgid "%i of these updates is a security update."
 msgid_plural "%i of these updates are security updates."
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< po/az.po
 #: ../data/apt_check.py:119
 msgid "To see these additional updates run: apt list --upgradable"
 msgstr ""
 
 #: ../data/apt_check.py:126
+=======
+#: ../data/apt_check.py:117
+msgid "To see these additional updates run: apt list --upgradable"
+msgstr ""
+
+#: ../data/apt_check.py:124
+>>>>>>> po/az.po
 #, 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] ""
 
+<<<<<<< po/az.po
 #: ../data/apt_check.py:137
 msgid "Enable UA Infra: ESM to receive additional future security updates."
 msgstr ""
@@ -73,19 +99,39 @@ msgid "See https://ubuntu.com/security/esm or run: sudo ua status"
 msgstr ""
 
 #: ../data/apt_check.py:184
+=======
+#: ../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:182
+>>>>>>> po/az.po
 #, python-format
 msgid "Error: Opening the cache (%s)"
 msgstr ""
 
+<<<<<<< po/az.po
 #: ../data/apt_check.py:194
 msgid "Error: BrokenCount > 0"
 msgstr ""
 
 #: ../data/apt_check.py:201
+=======
+#: ../data/apt_check.py:192
+msgid "Error: BrokenCount > 0"
+msgstr ""
+
+#: ../data/apt_check.py:199
+>>>>>>> po/az.po
 #, python-format
 msgid "Error: Marking the upgrade (%s)"
 msgstr ""
 
+<<<<<<< po/az.po
 #: ../data/apt_check.py:310
 msgid "Show the packages that are going to be installed/upgraded"
 msgstr ""
@@ -95,6 +141,17 @@ msgid "Show human readable output on stdout"
 msgstr ""
 
 #: ../data/apt_check.py:320
+=======
+#: ../data/apt_check.py:309
+msgid "Show the packages that are going to be installed/upgraded"
+msgstr ""
+
+#: ../data/apt_check.py:315
+msgid "Show human readable output on stdout"
+msgstr ""
+
+#: ../data/apt_check.py:319
+>>>>>>> po/az.po
 msgid ""
 "Return the time in days when security updates are installed unattended (0 "
 "means disabled)"
@@ -122,6 +179,21 @@ msgid ""
 "notification icon to display details. "
 msgstr ""
 
+<<<<<<< po/az.po
+=======
+#. Create and show the notification
+#: ../src/avahi.c:16
+msgid "Network service discovery disabled"
+msgstr ""
+
+#: ../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 ""
+
+>>>>>>> po/az.po
 #: ../src/cdroms.c:48
 msgid "Software Packages Volume Detected"
 msgstr ""
@@ -204,9 +276,14 @@ msgid "No current updates"
 msgstr "Yeniləmələri göstər"
 
 #: ../src/livepatch-tray.c:148
+<<<<<<< po/az.po
 #, c-format
 msgid "%zd current update"
 msgid_plural "%zd current updates"
+=======
+msgid "%"
+msgid_plural "%"
+>>>>>>> po/az.po
 msgstr[0] ""
 msgstr[1] ""
 
@@ -293,20 +370,36 @@ msgstr ""
 msgid "A problem occurred when checking for the updates."
 msgstr ""
 
+<<<<<<< po/az.po
 #: ../src/update-notifier.c:560
 msgid "- inform about updates"
 msgstr ""
 
 #: ../src/update-notifier.c:562
+=======
+#: ../src/update-notifier.c:585
+msgid "- inform about updates"
+msgstr ""
+
+#: ../src/update-notifier.c:587
+>>>>>>> po/az.po
 #, c-format
 msgid "Failed to init the UI: %s\n"
 msgstr ""
 
+<<<<<<< po/az.po
 #: ../src/update-notifier.c:563
 msgid "unknown error"
 msgstr ""
 
 #: ../src/update-notifier.c:590
+=======
+#: ../src/update-notifier.c:588
+msgid "unknown error"
+msgstr ""
+
+#: ../src/update-notifier.c:615
+>>>>>>> po/az.po
 msgid "update-notifier"
 msgstr ""
 
@@ -369,11 +462,14 @@ msgid ""
 "reinstall the packages to fix this problem."
 msgstr ""
 
+<<<<<<< po/az.po
 #~ 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."
 
+=======
+>>>>>>> po/az.po
 #~ msgid "System restart required"
 #~ msgstr "Sistemin yenidən başlaması mütləqdir"
 
diff --git a/po/be.po b/po/be.po
index 47f11a9..fbb62b3 100644
--- a/po/be.po
+++ b/po/be.po
@@ -7,7 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-notifier\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< po/be.po
 "POT-Creation-Date: 2020-11-12 23:53+0000\n"
+=======
+"POT-Creation-Date: 2020-11-19 05:20+0000\n"
+>>>>>>> po/be.po
 "PO-Revision-Date: 2011-10-10 07:18+0000\n"
 "Last-Translator: Maksim Tomkowicz <[e-mail]>\n"
 "Language-Team: Belarusian <[e-mail]>\n"
@@ -34,6 +38,7 @@ msgid "UA Infra: Extended Security Maintenance (ESM) is not enabled."
 msgstr ""
 
 #: ../data/apt_check.py:93
+<<<<<<< po/be.po
 #, fuzzy, python-format
 msgid "%i update can be installed immediately."
 msgid_plural "%i updates can be installed immediately."
@@ -42,6 +47,16 @@ msgstr[1] "%i абнаўленьні з'яўляюцца абнаўленьня
 msgstr[2] "%i абнаўленьняў з'яўляюцца абнаўленьнямі бясьпекі."
 
 #: ../data/apt_check.py:101
+=======
+#, python-format
+msgid "%i package can be updated."
+msgid_plural "%i packages can be updated."
+msgstr[0] "ёсьць абнаўленьні для %i пакунка."
+msgstr[1] "ёсьць абнаўленьні для %i пакункаў."
+msgstr[2] "ёсьць абнаўленьні для %i пакункаў."
+
+#: ../data/apt_check.py:99
+>>>>>>> po/be.po
 #, 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."
@@ -49,7 +64,11 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
+<<<<<<< po/be.po
 #: ../data/apt_check.py:110
+=======
+#: ../data/apt_check.py:108
+>>>>>>> po/be.po
 #, fuzzy, python-format
 msgid "%i of these updates is a security update."
 msgid_plural "%i of these updates are security updates."
@@ -57,11 +76,19 @@ msgstr[0] "%i абнаўленьне з'яўляецца абнаўленьне
 msgstr[1] "%i абнаўленьні з'яўляюцца абнаўленьнямі бясьпекі."
 msgstr[2] "%i абнаўленьняў з'яўляюцца абнаўленьнямі бясьпекі."
 
+<<<<<<< po/be.po
 #: ../data/apt_check.py:119
 msgid "To see these additional updates run: apt list --upgradable"
 msgstr ""
 
 #: ../data/apt_check.py:126
+=======
+#: ../data/apt_check.py:117
+msgid "To see these additional updates run: apt list --upgradable"
+msgstr ""
+
+#: ../data/apt_check.py:124
+>>>>>>> po/be.po
 #, 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."
@@ -69,6 +96,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
+<<<<<<< po/be.po
 #: ../data/apt_check.py:137
 msgid "Enable UA Infra: ESM to receive additional future security updates."
 msgstr ""
@@ -78,19 +106,39 @@ msgid "See https://ubuntu.com/security/esm or run: sudo ua status"
 msgstr ""
 
 #: ../data/apt_check.py:184
+=======
+#: ../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:182
+>>>>>>> po/be.po
 #, python-format
 msgid "Error: Opening the cache (%s)"
 msgstr "Памылка: адкрыцьцё кэша (%s)"
 
+<<<<<<< po/be.po
 #: ../data/apt_check.py:194
 msgid "Error: BrokenCount > 0"
 msgstr "Памылка: BrokenCount > 0"
 
 #: ../data/apt_check.py:201
+=======
+#: ../data/apt_check.py:192
+msgid "Error: BrokenCount > 0"
+msgstr "Памылка: BrokenCount > 0"
+
+#: ../data/apt_check.py:199
+>>>>>>> po/be.po
 #, python-format
 msgid "Error: Marking the upgrade (%s)"
 msgstr "Памылка: адзначэньне абнаўленьня (%s)"
 
+<<<<<<< po/be.po
 #: ../data/apt_check.py:310
 msgid "Show the packages that are going to be installed/upgraded"
 msgstr "Пакункі, якія будуць усталяваны ці абноўлены"
@@ -100,6 +148,17 @@ msgid "Show human readable output on stdout"
 msgstr "Выводзіць чытабельныя паведамленьні ў stdout"
 
 #: ../data/apt_check.py:320
+=======
+#: ../data/apt_check.py:309
+msgid "Show the packages that are going to be installed/upgraded"
+msgstr "Пакункі, якія будуць усталяваны ці абноўлены"
+
+#: ../data/apt_check.py:315
+msgid "Show human readable output on stdout"
+msgstr "Выводзіць чытабельныя паведамленьні ў stdout"
+
+#: ../data/apt_check.py:319
+>>>>>>> po/be.po
 msgid ""
 "Return the time in days when security updates are installed unattended (0 "
 "means disabled)"
@@ -131,6 +190,23 @@ msgstr ""
 "Дастасаваньне ў вашай сыстэме аварыйна завяршыла сваю працу (раней ці "
 "зараз). Пстрыкніце на значцы нагадваньня, каб убачыць падрабязнасьці. "
 
+<<<<<<< po/be.po
+=======
+#. Create and show the notification
+#: ../src/avahi.c:16
+msgid "Network service discovery disabled"
+msgstr "Служба дасьледваньня сеткі адключана"
+
+#: ../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 ""
+"Ваша бягучая сетка мае дамэн .local, які не рэкамэндаваны і несумяшчальны са "
+"службай дасьледваньня сеткі Avahi. Гэтая служба была адключана."
+
+>>>>>>> po/be.po
 #: ../src/cdroms.c:48
 msgid "Software Packages Volume Detected"
 msgstr "Знойдзены том з пакункамі праграмнага забесьпячэньня"
@@ -225,9 +301,14 @@ msgid "No current updates"
 msgstr "- інфармуе пра абнаўленьні"
 
 #: ../src/livepatch-tray.c:148
+<<<<<<< po/be.po
 #, c-format
 msgid "%zd current update"
 msgid_plural "%zd current updates"
+=======
+msgid "%"
+msgid_plural "%"
+>>>>>>> po/be.po
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -334,20 +415,36 @@ msgstr ""
 msgid "A problem occurred when checking for the updates."
 msgstr "Узьнікла праблема ў час праверкі абнаўленьняў."
 
+<<<<<<< po/be.po
 #: ../src/update-notifier.c:560
 msgid "- inform about updates"
 msgstr "- інфармуе пра абнаўленьні"
 
 #: ../src/update-notifier.c:562
+=======
+#: ../src/update-notifier.c:585
+msgid "- inform about updates"
+msgstr "- інфармуе пра абнаўленьні"
+
+#: ../src/update-notifier.c:587
+>>>>>>> po/be.po
 #, c-format
 msgid "Failed to init the UI: %s\n"
 msgstr "Немагчыма ініцыялізаваць UI: %s\n"
 
+<<<<<<< po/be.po
 #: ../src/update-notifier.c:563
 msgid "unknown error"
 msgstr "невядомая памылка"
 
 #: ../src/update-notifier.c:590
+=======
+#: ../src/update-notifier.c:588
+msgid "unknown error"
+msgstr "невядомая памылка"
+
+#: ../src/update-notifier.c:615
+>>>>>>> po/be.po
 msgid "update-notifier"
 msgstr "нагадвальнік-аб-абнаўленьнях"
 
@@ -410,12 +507,15 @@ msgid ""
 "reinstall the packages to fix this problem."
 msgstr ""
 
+<<<<<<< po/be.po
 #~ msgid "%i package can be updated."
 #~ msgid_plural "%i packages can be updated."
 #~ msgstr[0] "ёсьць абнаўленьні для %i пакунка."
 #~ msgstr[1] "ёсьць абнаўленьні для %i пакункаў."
 #~ msgstr[2] "ёсьць абнаўленьні для %i пакункаў."
 
+=======
+>>>>>>> po/be.po
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">Please enter your password to "
 #~ "access problem reports of system programs</span>"
@@ -424,6 +524,7 @@ msgstr ""
 #~ "каб атрымаць доступ да паведамленьняў пра праблемы ў сыстэмных праграмах</"
 #~ "span>"
 
+<<<<<<< po/be.po
 #~ msgid "Network service discovery disabled"
 #~ msgstr "Служба дасьледваньня сеткі адключана"
 
@@ -435,6 +536,8 @@ msgstr ""
 #~ "Ваша бягучая сетка мае дамэн .local, які не рэкамэндаваны і несумяшчальны "
 #~ "са службай дасьледваньня сеткі Avahi. Гэтая служба была адключана."
 
+=======
+>>>>>>> po/be.po
 #~ msgid "Addon volume detected"
 #~ msgstr "Знойдзены дадатковы носьбіт"
 
diff --git a/po/bem.po b/po/bem.po
index 10dc67c..2238352 100644
--- a/po/bem.po
+++ b/po/bem.po
@@ -7,7 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-notifier\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< po/bem.po
 "POT-Creation-Date: 2020-11-12 23:53+0000\n"
+=======
+"POT-Creation-Date: 2020-11-19 05:20+0000\n"
+>>>>>>> po/bem.po
 "PO-Revision-Date: 2011-05-10 13:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bemba <[e-mail]>\n"
@@ -34,36 +38,58 @@ msgstr ""
 
 #: ../data/apt_check.py:93
 #, python-format
+<<<<<<< po/bem.po
 msgid "%i update can be installed immediately."
 msgid_plural "%i updates can be installed immediately."
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../data/apt_check.py:101
+=======
+msgid "%i package can be updated."
+msgid_plural "%i packages can be updated."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../data/apt_check.py:99
+>>>>>>> po/bem.po
 #, 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] ""
 
+<<<<<<< po/bem.po
 #: ../data/apt_check.py:110
+=======
+#: ../data/apt_check.py:108
+>>>>>>> po/bem.po
 #, python-format
 msgid "%i of these updates is a security update."
 msgid_plural "%i of these updates are security updates."
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< po/bem.po
 #: ../data/apt_check.py:119
 msgid "To see these additional updates run: apt list --upgradable"
 msgstr ""
 
 #: ../data/apt_check.py:126
+=======
+#: ../data/apt_check.py:117
+msgid "To see these additional updates run: apt list --upgradable"
+msgstr ""
+
+#: ../data/apt_check.py:124
+>>>>>>> po/bem.po
 #, 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] ""
 
+<<<<<<< po/bem.po
 #: ../data/apt_check.py:137
 msgid "Enable UA Infra: ESM to receive additional future security updates."
 msgstr ""
@@ -73,19 +99,39 @@ msgid "See https://ubuntu.com/security/esm or run: sudo ua status"
 msgstr ""
 
 #: ../data/apt_check.py:184
+=======
+#: ../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:182
+>>>>>>> po/bem.po
 #, python-format
 msgid "Error: Opening the cache (%s)"
 msgstr ""
 
+<<<<<<< po/bem.po
 #: ../data/apt_check.py:194
 msgid "Error: BrokenCount > 0"
 msgstr ""
 
 #: ../data/apt_check.py:201
+=======
+#: ../data/apt_check.py:192
+msgid "Error: BrokenCount > 0"
+msgstr ""
+
+#: ../data/apt_check.py:199
+>>>>>>> po/bem.po
 #, python-format
 msgid "Error: Marking the upgrade (%s)"
 msgstr ""
 
+<<<<<<< po/bem.po
 #: ../data/apt_check.py:310
 msgid "Show the packages that are going to be installed/upgraded"
 msgstr ""
@@ -95,6 +141,17 @@ msgid "Show human readable output on stdout"
 msgstr ""
 
 #: ../data/apt_check.py:320
+=======
+#: ../data/apt_check.py:309
+msgid "Show the packages that are going to be installed/upgraded"
+msgstr ""
+
+#: ../data/apt_check.py:315
+msgid "Show human readable output on stdout"
+msgstr ""
+
+#: ../data/apt_check.py:319
+>>>>>>> po/bem.po
 msgid ""
 "Return the time in days when security updates are installed unattended (0 "
 "means disabled)"
@@ -122,6 +179,21 @@ msgid ""
 "notification icon to display details. "
 msgstr ""
 
+<<<<<<< po/bem.po
+=======
+#. Create and show the notification
+#: ../src/avahi.c:16
+msgid "Network service discovery disabled"
+msgstr ""
+
+#: ../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 ""
+
+>>>>>>> po/bem.po
 #: ../src/cdroms.c:48
 msgid "Software Packages Volume Detected"
 msgstr ""
@@ -203,9 +275,14 @@ msgid "No current updates"
 msgstr ""
 
 #: ../src/livepatch-tray.c:148
+<<<<<<< po/bem.po
 #, c-format
 msgid "%zd current update"
 msgid_plural "%zd current updates"
+=======
+msgid "%"
+msgid_plural "%"
+>>>>>>> po/bem.po
 msgstr[0] ""
 msgstr[1] ""
 
@@ -290,20 +367,36 @@ msgstr ""
 msgid "A problem occurred when checking for the updates."
 msgstr ""
 
+<<<<<<< po/bem.po
 #: ../src/update-notifier.c:560
 msgid "- inform about updates"
 msgstr ""
 
 #: ../src/update-notifier.c:562
+=======
+#: ../src/update-notifier.c:585
+msgid "- inform about updates"
+msgstr ""
+
+#: ../src/update-notifier.c:587
+>>>>>>> po/bem.po
 #, c-format
 msgid "Failed to init the UI: %s\n"
 msgstr ""
 
+<<<<<<< po/bem.po
 #: ../src/update-notifier.c:563
 msgid "unknown error"
 msgstr ""
 
 #: ../src/update-notifier.c:590
+=======
+#: ../src/update-notifier.c:588
+msgid "unknown error"
+msgstr ""
+
+#: ../src/update-notifier.c:615
+>>>>>>> po/bem.po
 msgid "update-notifier"
 msgstr ""
 
diff --git a/po/bg.po b/po/bg.po
index 467a410..107ab2d 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-notifier\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< po/bg.po
 "POT-Creation-Date: 2020-11-12 23:53+0000\n"
+=======
+"POT-Creation-Date: 2020-11-19 05:20+0000\n"
+>>>>>>> po/bg.po
 "PO-Revision-Date: 2013-03-12 10:57+0000\n"
 "Last-Translator: Atanas Kovachki <Unknown>\n"
 "Language-Team: Bulgarian <[e-mail]>\n"
@@ -33,6 +37,7 @@ msgid "UA Infra: Extended Security Maintenance (ESM) is not enabled."
 msgstr ""
 
 #: ../data/apt_check.py:93
+<<<<<<< po/bg.po
 #, fuzzy, python-format
 msgid "%i update can be installed immediately."
 msgid_plural "%i updates can be installed immediately."
@@ -40,30 +45,52 @@ msgstr[0] "%i актуализация за сигурността."
 msgstr[1] "%i актуализации за сигурността."
 
 #: ../data/apt_check.py:101
+=======
+#, 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:99
+>>>>>>> po/bg.po
 #, 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] ""
 
+<<<<<<< po/bg.po
 #: ../data/apt_check.py:110
+=======
+#: ../data/apt_check.py:108
+>>>>>>> po/bg.po
 #, 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 актуализации за сигурността."
 
+<<<<<<< po/bg.po
 #: ../data/apt_check.py:119
 msgid "To see these additional updates run: apt list --upgradable"
 msgstr ""
 
 #: ../data/apt_check.py:126
+=======
+#: ../data/apt_check.py:117
+msgid "To see these additional updates run: apt list --upgradable"
+msgstr ""
+
+#: ../data/apt_check.py:124
+>>>>>>> po/bg.po
 #, 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] ""
 
+<<<<<<< po/bg.po
 #: ../data/apt_check.py:137
 msgid "Enable UA Infra: ESM to receive additional future security updates."
 msgstr ""
@@ -73,19 +100,39 @@ msgid "See https://ubuntu.com/security/esm or run: sudo ua status"
 msgstr ""
 
 #: ../data/apt_check.py:184
+=======
+#: ../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:182
+>>>>>>> po/bg.po
 #, python-format
 msgid "Error: Opening the cache (%s)"
 msgstr "Грешка: Отваряне на кеша (%s)"
 
+<<<<<<< po/bg.po
 #: ../data/apt_check.py:194
 msgid "Error: BrokenCount > 0"
 msgstr "Грешка: BrokenCount > 0"
 
 #: ../data/apt_check.py:201
+=======
+#: ../data/apt_check.py:192
+msgid "Error: BrokenCount > 0"
+msgstr "Грешка: BrokenCount > 0"
+
+#: ../data/apt_check.py:199
+>>>>>>> po/bg.po
 #, python-format
 msgid "Error: Marking the upgrade (%s)"
 msgstr "Грешка: Маркиране на надграждане (%s)"
 
+<<<<<<< po/bg.po
 #: ../data/apt_check.py:310
 msgid "Show the packages that are going to be installed/upgraded"
 msgstr "Показване на пакетите, които ще бъдат инсталирани/надградени"
@@ -95,6 +142,17 @@ msgid "Show human readable output on stdout"
 msgstr "Показване на четим език изходният текст на stdout"
 
 #: ../data/apt_check.py:320
+=======
+#: ../data/apt_check.py:309
+msgid "Show the packages that are going to be installed/upgraded"
+msgstr "Показване на пакетите, които ще бъдат инсталирани/надградени"
+
+#: ../data/apt_check.py:315
+msgid "Show human readable output on stdout"
+msgstr "Показване на четим език изходният текст на stdout"
+
+#: ../data/apt_check.py:319
+>>>>>>> po/bg.po
 msgid ""
 "Return the time in days when security updates are installed unattended (0 "
 "means disabled)"
@@ -126,6 +184,23 @@ msgstr ""
 "Имало е срив в някоя програма (сега или преди време). Натиснете върху "
 "иконата, за да видите подробности. "
 
+<<<<<<< po/bg.po
+=======
+#. Create and show the notification
+#: ../src/avahi.c:16
+msgid "Network service discovery disabled"
+msgstr "Откриването на мрежови услуги забранено"
+
+#: ../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 ""
+"Вашата текуща мрежа има .local домейн, което не е препоръчително и "
+"несъвместимо с услугата за откриване на мрежа Avahi. Услугата беше изключена."
+
+>>>>>>> po/bg.po
 #: ../src/cdroms.c:48
 msgid "Software Packages Volume Detected"
 msgstr "Открит е носител със софтуерни пакети"
@@ -220,9 +295,14 @@ msgid "No current updates"
 msgstr "- информиране за актуализации"
 
 #: ../src/livepatch-tray.c:148
+<<<<<<< po/bg.po
 #, c-format
 msgid "%zd current update"
 msgid_plural "%zd current updates"
+=======
+msgid "%"
+msgid_plural "%"
+>>>>>>> po/bg.po
 msgstr[0] ""
 msgstr[1] ""
 
@@ -326,20 +406,36 @@ msgstr ""
 msgid "A problem occurred when checking for the updates."
 msgstr "Възникна проблем при проверка за актуализации."
 
+<<<<<<< po/bg.po
 #: ../src/update-notifier.c:560
 msgid "- inform about updates"
 msgstr "- информиране за актуализации"
 
 #: ../src/update-notifier.c:562
+=======
+#: ../src/update-notifier.c:585
+msgid "- inform about updates"
+msgstr "- информиране за актуализации"
+
+#: ../src/update-notifier.c:587
+>>>>>>> po/bg.po
 #, c-format
 msgid "Failed to init the UI: %s\n"
 msgstr "Неуспешен опит за инициализиране на потребителския интерфейс: %s\n"
 
+<<<<<<< po/bg.po
 #: ../src/update-notifier.c:563
 msgid "unknown error"
 msgstr "неизвестна грешка"
 
 #: ../src/update-notifier.c:590
+=======
+#: ../src/update-notifier.c:588
+msgid "unknown error"
+msgstr "неизвестна грешка"
+
+#: ../src/update-notifier.c:615
+>>>>>>> po/bg.po
 msgid "update-notifier"
 msgstr "известяване за актуализации"
 
@@ -412,11 +508,14 @@ msgstr ""
 "след това за да оправите проблема, трябва да изтриете и да изпълните ново "
 "инсталиране на пакетите."
 
+<<<<<<< po/bg.po
 #~ msgid "%i package can be updated."
 #~ msgid_plural "%i packages can be updated."
 #~ msgstr[0] "%i пакет може да бъде актуализиран."
 #~ msgstr[1] "%i пакета могат да бъдат актуализирани."
 
+=======
+>>>>>>> po/bg.po
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">Please enter your password to "
 #~ "access problem reports of system programs</span>"
@@ -424,6 +523,7 @@ msgstr ""
 #~ "<span weight=\"bold\" size=\"larger\">Моля, въведете паролата си за да "
 #~ "достъпите докладите за проблеми със системни програми</span>"
 
+<<<<<<< po/bg.po
 #~ msgid "Network service discovery disabled"
 #~ msgstr "Откриването на мрежови услуги забранено"
 
@@ -436,6 +536,8 @@ msgstr ""
 #~ "несъвместимо с услугата за откриване на мрежа Avahi. Услугата беше "
 #~ "изключена."
 
+=======
+>>>>>>> po/bg.po
 #~ msgid "Addon volume detected"
 #~ msgstr "Открит е носител с допълнения"
 
diff --git a/po/bn.po b/po/bn.po
index f502bec..c6cb3b6 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -7,7 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-notifier\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< po/bn.po
 "POT-Creation-Date: 2020-11-12 23:53+0000\n"
+=======
+"POT-Creation-Date: 2020-11-19 05:20+0000\n"
+>>>>>>> po/bn.po
 "PO-Revision-Date: 2012-04-16 11:22+0000\n"
 "Last-Translator: Robin Mehdee <Unknown>\n"
 "Language-Team: Bengali <[e-mail]>\n"
@@ -34,6 +38,7 @@ msgid "UA Infra: Extended Security Maintenance (ESM) is not enabled."
 msgstr ""
 
 #: ../data/apt_check.py:93
+<<<<<<< po/bn.po
 #, fuzzy, python-format
 msgid "%i update can be installed immediately."
 msgid_plural "%i updates can be installed immediately."
@@ -41,30 +46,52 @@ msgstr[0] "%i হল নিরাপত্তা হালনাগাদ"
 msgstr[1] "%i হল নিরাপত্তা আপডেট"
 
 #: ../data/apt_check.py:101
+=======
+#, 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:99
+>>>>>>> po/bn.po
 #, 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] ""
 
+<<<<<<< po/bn.po
 #: ../data/apt_check.py:110
+=======
+#: ../data/apt_check.py:108
+>>>>>>> po/bn.po
 #, 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 হল নিরাপত্তা আপডেট"
 
+<<<<<<< po/bn.po
 #: ../data/apt_check.py:119
 msgid "To see these additional updates run: apt list --upgradable"
 msgstr ""
 
 #: ../data/apt_check.py:126
+=======
+#: ../data/apt_check.py:117
+msgid "To see these additional updates run: apt list --upgradable"
+msgstr ""
+
+#: ../data/apt_check.py:124
+>>>>>>> po/bn.po
 #, 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] ""
 
+<<<<<<< po/bn.po
 #: ../data/apt_check.py:137
 msgid "Enable UA Infra: ESM to receive additional future security updates."
 msgstr ""
@@ -74,19 +101,39 @@ msgid "See https://ubuntu.com/security/esm or run: sudo ua status"
 msgstr ""
 
 #: ../data/apt_check.py:184
+=======
+#: ../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:182
+>>>>>>> po/bn.po
 #, python-format
 msgid "Error: Opening the cache (%s)"
 msgstr "ত্রুটি: ক্যাশ খোলা হচ্ছে (%s)"
 
+<<<<<<< po/bn.po
 #: ../data/apt_check.py:194
 msgid "Error: BrokenCount > 0"
 msgstr "ত্রুটি: BrokenCount > 0"
 
 #: ../data/apt_check.py:201
+=======
+#: ../data/apt_check.py:192
+msgid "Error: BrokenCount > 0"
+msgstr "ত্রুটি: BrokenCount > 0"
+
+#: ../data/apt_check.py:199
+>>>>>>> po/bn.po
 #, python-format
 msgid "Error: Marking the upgrade (%s)"
 msgstr "ত্রুটি: আপগ্রেড চিহ্নিত করা হচ্ছে (%s)"
 
+<<<<<<< po/bn.po
 #: ../data/apt_check.py:310
 msgid "Show the packages that are going to be installed/upgraded"
 msgstr "ইনস্টল/ আপগ্রেড করা হবে এমন প্যাকেজগুলি দেখানো হবে"
@@ -96,6 +143,17 @@ msgid "Show human readable output on stdout"
 msgstr "stdout এর উপর"
 
 #: ../data/apt_check.py:320
+=======
+#: ../data/apt_check.py:309
+msgid "Show the packages that are going to be installed/upgraded"
+msgstr "ইনস্টল/ আপগ্রেড করা হবে এমন প্যাকেজগুলি দেখানো হবে"
+
+#: ../data/apt_check.py:315
+msgid "Show human readable output on stdout"
+msgstr "stdout এর উপর"
+
+#: ../data/apt_check.py:319
+>>>>>>> po/bn.po
 msgid ""
 "Return the time in days when security updates are installed unattended (0 "
 "means disabled)"
@@ -127,6 +185,23 @@ msgstr ""
 "আপনার সিস্টেমে (এখন বা অতীতে) একটি অ্যাপলিকেশন ক্র্যাশ করেছে। বিস্তারিত দেখতে "
 "নোটিফিকেশন আইকনে ক্লিক করুন। "
 
+<<<<<<< po/bn.po
+=======
+#. Create and show the notification
+#: ../src/avahi.c:16
+msgid "Network service discovery disabled"
+msgstr "নেটওয়ার্ক সেবা খোঁজা বন্ধ"
+
+#: ../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 ""
+"আপনার বর্তমান নেটওয়ার্কে .local ডোমেইন রয়েছে, যা সুপারিশ করা হয় না এবং আভাহি "
+"নেটওয়ার্ক সেবা খোঁজার সাথে অসঙ্গতিপূর্ণ। সেবাটি বন্ধ করা হয়েছে।"
+
+>>>>>>> po/bn.po
 #: ../src/cdroms.c:48
 msgid "Software Packages Volume Detected"
 msgstr "সফটওয়্যার প্যাকেজের ভলিউম পাওয়া গিয়েছে"
@@ -221,9 +296,14 @@ msgid "No current updates"
 msgstr "- হালনাগাদ সম্বন্ধে জানানো হবে"
 
 #: ../src/livepatch-tray.c:148
+<<<<<<< po/bn.po
 #, c-format
 msgid "%zd current update"
 msgid_plural "%zd current updates"
+=======
+msgid "%"
+msgid_plural "%"
+>>>>>>> po/bn.po
 msgstr[0] ""
 msgstr[1] ""
 
@@ -324,20 +404,36 @@ msgstr "এটা দেখে মনে হচ্ছে আপনার ইন
 msgid "A problem occurred when checking for the updates."
 msgstr "হালনাগাদের জন্য পরীক্ষা করার সময় একটি সমস্যা দেখা দিয়েছে।"
 
+<<<<<<< po/bn.po
 #: ../src/update-notifier.c:560
 msgid "- inform about updates"
 msgstr "- হালনাগাদ সম্বন্ধে জানানো হবে"
 
 #: ../src/update-notifier.c:562
+=======
+#: ../src/update-notifier.c:585
+msgid "- inform about updates"
+msgstr "- হালনাগাদ সম্বন্ধে জানানো হবে"
+
+#: ../src/update-notifier.c:587
+>>>>>>> po/bn.po
 #, c-format
 msgid "Failed to init the UI: %s\n"
 msgstr "UI আরম্ভ করতে ব্যর্থ: %s\n"
 
+<<<<<<< po/bn.po
 #: ../src/update-notifier.c:563
 msgid "unknown error"
 msgstr "অজানা ত্রুটি"
 
 #: ../src/update-notifier.c:590
+=======
+#: ../src/update-notifier.c:588
+msgid "unknown error"
+msgstr "অজানা ত্রুটি"
+
+#: ../src/update-notifier.c:615
+>>>>>>> po/bn.po
 msgid "update-notifier"
 msgstr "হালনাগাদ-পর্যবেক্ষক"
 
@@ -407,11 +503,14 @@ msgstr ""
 "আপনার হয়ত ইন্টারনেট সংযোগ ঠিক করা উচিত, তারপর এই সমস্যা সমাধানের জন্য প্যাকেজ "
 "অপসারণ করে পুনরায় ইনস্টল করা উচিত।"
 
+<<<<<<< po/bn.po
 #~ msgid "%i package can be updated."
 #~ msgid_plural "%i packages can be updated."
 #~ msgstr[0] "%i প্যাকেজ হালনাগাদ করা সম্ভব"
 #~ msgstr[1] "%i প্যাকেজ হালনাগাদ করা সম্ভব"
 
+=======
+>>>>>>> po/bn.po
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">Please enter your password to "
 #~ "access problem reports of system programs</span>"
@@ -419,6 +518,7 @@ msgstr ""
 #~ "<span weight=\"bold\" size=\"larger\">আপনার সিস্টেমের সমস্যার বিবরনী পাওয়ার "
 #~ "জন্য অনুগ্রহ করে পাসওয়ার্ড দিন</span>"
 
+<<<<<<< po/bn.po
 #~ msgid "Network service discovery disabled"
 #~ msgstr "নেটওয়ার্ক সেবা খোঁজা বন্ধ"
 
@@ -430,6 +530,8 @@ msgstr ""
 #~ "আপনার বর্তমান নেটওয়ার্কে .local ডোমেইন রয়েছে, যা সুপারিশ করা হয় না এবং আভাহি "
 #~ "নেটওয়ার্ক সেবা খোঁজার সাথে অসঙ্গতিপূর্ণ। সেবাটি বন্ধ করা হয়েছে।"
 
+=======
+>>>>>>> po/bn.po
 #~ msgid "Addon volume detected"
 #~ msgstr "অ্যাডঅন ভলিউম পাওয়া গিয়েছে"
 
diff --git a/po/bo.po b/po/bo.po
index 1d17f23..b74899a 100644
--- a/po/bo.po
+++ b/po/bo.po
@@ -7,7 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-notifier\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< po/bo.po
 "POT-Creation-Date: 2020-11-12 23:53+0000\n"
+=======
+"POT-Creation-Date: 2020-11-19 05:20+0000\n"
+>>>>>>> po/bo.po
 "PO-Revision-Date: 2011-06-19 07:49+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Tibetan <[e-mail]>\n"
@@ -34,32 +38,54 @@ msgstr ""
 
 #: ../data/apt_check.py:93
 #, python-format
+<<<<<<< po/bo.po
 msgid "%i update can be installed immediately."
 msgid_plural "%i updates can be installed immediately."
 msgstr[0] ""
 
 #: ../data/apt_check.py:101
+=======
+msgid "%i package can be updated."
+msgid_plural "%i packages can be updated."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../data/apt_check.py:99
+>>>>>>> po/bo.po
 #, 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] ""
 
+<<<<<<< po/bo.po
 #: ../data/apt_check.py:110
+=======
+#: ../data/apt_check.py:108
+>>>>>>> po/bo.po
 #, python-format
 msgid "%i of these updates is a security update."
 msgid_plural "%i of these updates are security updates."
 msgstr[0] ""
 
+<<<<<<< po/bo.po
 #: ../data/apt_check.py:119
 msgid "To see these additional updates run: apt list --upgradable"
 msgstr ""
 
 #: ../data/apt_check.py:126
+=======
+#: ../data/apt_check.py:117
+msgid "To see these additional updates run: apt list --upgradable"
+msgstr ""
+
+#: ../data/apt_check.py:124
+>>>>>>> po/bo.po
 #, 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] ""
 
+<<<<<<< po/bo.po
 #: ../data/apt_check.py:137
 msgid "Enable UA Infra: ESM to receive additional future security updates."
 msgstr ""
@@ -69,19 +95,39 @@ msgid "See https://ubuntu.com/security/esm or run: sudo ua status"
 msgstr ""
 
 #: ../data/apt_check.py:184
+=======
+#: ../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:182
+>>>>>>> po/bo.po
 #, python-format
 msgid "Error: Opening the cache (%s)"
 msgstr ""
 
+<<<<<<< po/bo.po
 #: ../data/apt_check.py:194
 msgid "Error: BrokenCount > 0"
 msgstr ""
 
 #: ../data/apt_check.py:201
+=======
+#: ../data/apt_check.py:192
+msgid "Error: BrokenCount > 0"
+msgstr ""
+
+#: ../data/apt_check.py:199
+>>>>>>> po/bo.po
 #, python-format
 msgid "Error: Marking the upgrade (%s)"
 msgstr ""
 
+<<<<<<< po/bo.po
 #: ../data/apt_check.py:310
 msgid "Show the packages that are going to be installed/upgraded"
 msgstr ""
@@ -91,6 +137,17 @@ msgid "Show human readable output on stdout"
 msgstr ""
 
 #: ../data/apt_check.py:320
+=======
+#: ../data/apt_check.py:309
+msgid "Show the packages that are going to be installed/upgraded"
+msgstr ""
+
+#: ../data/apt_check.py:315
+msgid "Show human readable output on stdout"
+msgstr ""
+
+#: ../data/apt_check.py:319
+>>>>>>> po/bo.po
 msgid ""
 "Return the time in days when security updates are installed unattended (0 "
 "means disabled)"
@@ -118,6 +175,21 @@ msgid ""
 "notification icon to display details. "
 msgstr ""
 
+<<<<<<< po/bo.po
+=======
+#. Create and show the notification
+#: ../src/avahi.c:16
+msgid "Network service discovery disabled"
+msgstr ""
+
+#: ../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 ""
+
+>>>>>>> po/bo.po
 #: ../src/cdroms.c:48
 msgid "Software Packages Volume Detected"
 msgstr ""
@@ -199,9 +271,14 @@ msgid "No current updates"
 msgstr ""
 
 #: ../src/livepatch-tray.c:148
+<<<<<<< po/bo.po
 #, c-format
 msgid "%zd current update"
 msgid_plural "%zd current updates"
+=======
+msgid "%"
+msgid_plural "%"
+>>>>>>> po/bo.po
 msgstr[0] ""
 
 #: ../src/livepatch-tray.c:168
@@ -285,20 +362,36 @@ msgstr ""
 msgid "A problem occurred when checking for the updates."
 msgstr ""
 
+<<<<<<< po/bo.po
 #: ../src/update-notifier.c:560
 msgid "- inform about updates"
 msgstr ""
 
 #: ../src/update-notifier.c:562
+=======
+#: ../src/update-notifier.c:585
+msgid "- inform about updates"
+msgstr ""
+
+#: ../src/update-notifier.c:587
+>>>>>>> po/bo.po
 #, c-format
 msgid "Failed to init the UI: %s\n"
 msgstr ""
 
+<<<<<<< po/bo.po
 #: ../src/update-notifier.c:563
 msgid "unknown error"
 msgstr ""
 
 #: ../src/update-notifier.c:590
+=======
+#: ../src/update-notifier.c:588
+msgid "unknown error"
+msgstr ""
+
+#: ../src/update-notifier.c:615
+>>>>>>> po/bo.po
 msgid "update-notifier"
 msgstr ""
 
diff --git a/po/br.po b/po/br.po
index 5a1ce5c..5b1cc71 100644
--- a/po/br.po
+++ b/po/br.po
@@ -7,7 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-notifier\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< po/br.po
 "POT-Creation-Date: 2020-11-12 23:53+0000\n"
+=======
+"POT-Creation-Date: 2020-11-19 05:20+0000\n"
+>>>>>>> po/br.po
 "PO-Revision-Date: 2013-04-01 16:49+0000\n"
 "Last-Translator: Denis <Unknown>\n"
 "Language-Team: Breton <[e-mail]>\n"
@@ -33,6 +37,7 @@ msgid "UA Infra: Extended Security Maintenance (ESM) is not enabled."
 msgstr ""
 
 #: ../data/apt_check.py:93
+<<<<<<< po/br.po
 #, fuzzy, python-format
 msgid "%i update can be installed immediately."
 msgid_plural "%i updates can be installed immediately."
@@ -40,30 +45,52 @@ msgstr[0] "%i hivizadenn a-fet diogelroez."
 msgstr[1] "%i hivizadenn a-fet diogelroez."
 
 #: ../data/apt_check.py:101
+=======
+#, python-format
+msgid "%i package can be updated."
+msgid_plural "%i packages can be updated."
+msgstr[0] "%i pakad a c'hall bezañ hivizaet."
+msgstr[1] "%i a bakadoù a c'hall bezañ hivizaet."
+
+#: ../data/apt_check.py:99
+>>>>>>> po/br.po
 #, 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] ""
 
+<<<<<<< po/br.po
 #: ../data/apt_check.py:110
+=======
+#: ../data/apt_check.py:108
+>>>>>>> po/br.po
 #, fuzzy, python-format
 msgid "%i of these updates is a security update."
 msgid_plural "%i of these updates are security updates."
 msgstr[0] "%i hivizadenn a-fet diogelroez."
 msgstr[1] "%i hivizadenn a-fet diogelroez."
 
+<<<<<<< po/br.po
 #: ../data/apt_check.py:119
 msgid "To see these additional updates run: apt list --upgradable"
 msgstr ""
 
 #: ../data/apt_check.py:126
+=======
+#: ../data/apt_check.py:117
+msgid "To see these additional updates run: apt list --upgradable"
+msgstr ""
+
+#: ../data/apt_check.py:124
+>>>>>>> po/br.po
 #, 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] ""
 
+<<<<<<< po/br.po
 #: ../data/apt_check.py:137
 msgid "Enable UA Infra: ESM to receive additional future security updates."
 msgstr ""
@@ -73,19 +100,39 @@ msgid "See https://ubuntu.com/security/esm or run: sudo ua status"
 msgstr ""
 
 #: ../data/apt_check.py:184
+=======
+#: ../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:182
+>>>>>>> po/br.po
 #, python-format
 msgid "Error: Opening the cache (%s)"
 msgstr "Fazi : O tigeriñ ar grubuilh (%s)"
 
+<<<<<<< po/br.po
 #: ../data/apt_check.py:194
 msgid "Error: BrokenCount > 0"
 msgstr "Fazi : Pakadoù torret > 0"
 
 #: ../data/apt_check.py:201
+=======
+#: ../data/apt_check.py:192
+msgid "Error: BrokenCount > 0"
+msgstr "Fazi : Pakadoù torret > 0"
+
+#: ../data/apt_check.py:199
+>>>>>>> po/br.po
 #, python-format
 msgid "Error: Marking the upgrade (%s)"
 msgstr "Fazi : Merk an hivizadenn (%s)"
 
+<<<<<<< po/br.po
 #: ../data/apt_check.py:310
 msgid "Show the packages that are going to be installed/upgraded"
 msgstr "Diskouez ar pakadoù a vo staliet/hivizaet"
@@ -95,6 +142,17 @@ msgid "Show human readable output on stdout"
 msgstr "Diskouez un un ec'hankad a c'hell bezañ lennet gant un den war stdout"
 
 #: ../data/apt_check.py:320
+=======
+#: ../data/apt_check.py:309
+msgid "Show the packages that are going to be installed/upgraded"
+msgstr "Diskouez ar pakadoù a vo staliet/hivizaet"
+
+#: ../data/apt_check.py:315
+msgid "Show human readable output on stdout"
+msgstr "Diskouez un un ec'hankad a c'hell bezañ lennet gant un den war stdout"
+
+#: ../data/apt_check.py:319
+>>>>>>> po/br.po
 msgid ""
 "Return the time in days when security updates are installed unattended (0 "
 "means disabled)"
@@ -126,6 +184,23 @@ msgstr ""
 "Sac'het eo un arload war ho reizhiad (bremañ pe a-raok). Klikit war an arlun-"
 "kelaouiñ evit skrammañ ar munudoù. "
 
+<<<<<<< po/br.po
+=======
+#. Create and show the notification
+#: ../src/avahi.c:16
+msgid "Network service discovery disabled"
+msgstr "Klask gwazerezhioù ar rouedad diweredekaet"
+
+#: ../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 ""
+"Un domani .local a zo gant ho rouedad, n'eo ket erbedet hag embreget gant ar "
+"c'hlask gwazerezhioù evit ar rouedad Avahi. Diweredekaet eo bet ar gwazerezh."
+
+>>>>>>> po/br.po
 #: ../src/cdroms.c:48
 msgid "Software Packages Volume Detected"
 msgstr "Pezhienn a ginnig pakadoù meziant dinoet"
@@ -220,9 +295,14 @@ msgid "No current updates"
 msgstr "- titour diwar benn hizivadennoù"
 
 #: ../src/livepatch-tray.c:148
+<<<<<<< po/br.po
 #, c-format
 msgid "%zd current update"
 msgid_plural "%zd current updates"
+=======
+msgid "%"
+msgid_plural "%"
+>>>>>>> po/br.po
 msgstr[0] ""
 msgstr[1] ""
 
@@ -320,20 +400,36 @@ msgstr "Alies e talvez ez eus amzalc'hioù diziskoulm gant ho pakadoù staliet"
 msgid "A problem occurred when checking for the updates."
 msgstr "Ur gudenn a zo bet pa oa o wiriañ an hizivadennoù."
 
+<<<<<<< po/br.po
 #: ../src/update-notifier.c:560
 msgid "- inform about updates"
 msgstr "- titour diwar benn hizivadennoù"
 
 #: ../src/update-notifier.c:562
+=======
+#: ../src/update-notifier.c:585
+msgid "- inform about updates"
+msgstr "- titour diwar benn hizivadennoù"
+
+#: ../src/update-notifier.c:587
+>>>>>>> po/br.po
 #, c-format
 msgid "Failed to init the UI: %s\n"
 msgstr "C'hwitadenn war deraouekaat ketal an arveriad : %s\n"
 
+<<<<<<< po/br.po
 #: ../src/update-notifier.c:563
 msgid "unknown error"
 msgstr "fazi dianav"
 
 #: ../src/update-notifier.c:590
+=======
+#: ../src/update-notifier.c:588
+msgid "unknown error"
+msgstr "fazi dianav"
+
+#: ../src/update-notifier.c:615
+>>>>>>> po/br.po
 msgid "update-notifier"
 msgstr "Meziant kelaouiñ a-fet hizivadennoù"
 
@@ -396,11 +492,14 @@ msgid ""
 "reinstall the packages to fix this problem."
 msgstr ""
 
+<<<<<<< po/br.po
 #~ msgid "%i package can be updated."
 #~ msgid_plural "%i packages can be updated."
 #~ msgstr[0] "%i pakad a c'hall bezañ hivizaet."
 #~ msgstr[1] "%i a bakadoù a c'hall bezañ hivizaet."
 
+=======
+>>>>>>> po/br.po
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">Please enter your password to "
 #~ "access problem reports of system programs</span>"
@@ -408,6 +507,7 @@ msgstr ""
 #~ "<span weight=\"bold\" size=\"larger\">Bizskrivit ho ker-tremen evit "
 #~ "tizhout an danevelloù a-fet fazioù eus meziantoù ar reizhiad</span>"
 
+<<<<<<< po/br.po
 #~ msgid "Network service discovery disabled"
 #~ msgstr "Klask gwazerezhioù ar rouedad diweredekaet"
 
@@ -420,6 +520,8 @@ msgstr ""
 #~ "ar c'hlask gwazerezhioù evit ar rouedad Avahi. Diweredekaet eo bet ar "
 #~ "gwazerezh."
 
+=======
+>>>>>>> po/br.po
 #~ msgid "Addon volume detected"
 #~ msgstr "Dinoet ez eus bet ur bezhienn ouzhpenn"
 
diff --git a/po/bs.po b/po/bs.po
index 905c127..b589ba1 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -7,7 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-notifier\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< po/bs.po
 "POT-Creation-Date: 2020-11-12 23:53+0000\n"
+=======
+"POT-Creation-Date: 2020-11-19 05:20+0000\n"
+>>>>>>> po/bs.po
 "PO-Revision-Date: 2012-04-13 06:13+0000\n"
 "Last-Translator: Samir Ribić <Unknown>\n"
 "Language-Team: Bosnian <[e-mail]>\n"
@@ -34,6 +38,7 @@ msgid "UA Infra: Extended Security Maintenance (ESM) is not enabled."
 msgstr ""
 
 #: ../data/apt_check.py:93
+<<<<<<< po/bs.po
 #, fuzzy, python-format
 msgid "%i update can be installed immediately."
 msgid_plural "%i updates can be installed immediately."
@@ -42,6 +47,16 @@ msgstr[1] "%i osvježavanja su sigurnosna"
 msgstr[2] "%i osvježavanja su sigurnosna"
 
 #: ../data/apt_check.py:101
+=======
+#, python-format
+msgid "%i package can be updated."
+msgid_plural "%i packages can be updated."
+msgstr[0] "%i paket može biti osvježen"
+msgstr[1] "%i paketa mogu biti osvježena"
+msgstr[2] "%i paketa može biti osvježeno"
+
+#: ../data/apt_check.py:99
+>>>>>>> po/bs.po
 #, 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."
@@ -49,7 +64,11 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
+<<<<<<< po/bs.po
 #: ../data/apt_check.py:110
+=======
+#: ../data/apt_check.py:108
+>>>>>>> po/bs.po
 #, fuzzy, python-format
 msgid "%i of these updates is a security update."
 msgid_plural "%i of these updates are security updates."
@@ -57,11 +76,19 @@ msgstr[0] "%i osvježavanje je sigurnosno"
 msgstr[1] "%i osvježavanja su sigurnosna"
 msgstr[2] "%i osvježavanja su sigurnosna"
 
+<<<<<<< po/bs.po
 #: ../data/apt_check.py:119
 msgid "To see these additional updates run: apt list --upgradable"
 msgstr ""
 
 #: ../data/apt_check.py:126
+=======
+#: ../data/apt_check.py:117
+msgid "To see these additional updates run: apt list --upgradable"
+msgstr ""
+
+#: ../data/apt_check.py:124
+>>>>>>> po/bs.po
 #, 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."
@@ -69,6 +96,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
+<<<<<<< po/bs.po
 #: ../data/apt_check.py:137
 msgid "Enable UA Infra: ESM to receive additional future security updates."
 msgstr ""
@@ -78,19 +106,39 @@ msgid "See https://ubuntu.com/security/esm or run: sudo ua status"
 msgstr ""
 
 #: ../data/apt_check.py:184
+=======
+#: ../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:182
+>>>>>>> po/bs.po
 #, python-format
 msgid "Error: Opening the cache (%s)"
 msgstr "Greška: Otvaram keš (%s)"
 
+<<<<<<< po/bs.po
 #: ../data/apt_check.py:194
 msgid "Error: BrokenCount > 0"
 msgstr "Greška: BrokenCount > 0"
 
 #: ../data/apt_check.py:201
+=======
+#: ../data/apt_check.py:192
+msgid "Error: BrokenCount > 0"
+msgstr "Greška: BrokenCount > 0"
+
+#: ../data/apt_check.py:199
+>>>>>>> po/bs.po
 #, python-format
 msgid "Error: Marking the upgrade (%s)"
 msgstr "Greška: Obiljžavanje nadogradnje (%s)"
 
+<<<<<<< po/bs.po
 #: ../data/apt_check.py:310
 msgid "Show the packages that are going to be installed/upgraded"
 msgstr "Pokaži pakete koji će biti instalirani/nadograđeni"
@@ -100,6 +148,17 @@ msgid "Show human readable output on stdout"
 msgstr "Prikaži čitljiv izlaz na stdout"
 
 #: ../data/apt_check.py:320
+=======
+#: ../data/apt_check.py:309
+msgid "Show the packages that are going to be installed/upgraded"
+msgstr "Pokaži pakete koji će biti instalirani/nadograđeni"
+
+#: ../data/apt_check.py:315
+msgid "Show human readable output on stdout"
+msgstr "Prikaži čitljiv izlaz na stdout"
+
+#: ../data/apt_check.py:319
+>>>>>>> po/bs.po
 msgid ""
 "Return the time in days when security updates are installed unattended (0 "
 "means disabled)"
@@ -131,6 +190,23 @@ msgstr ""
 "Neki program je pao na vašem sistemu (sada ili u prošlosti). Kliknite na "
 "ikonu obavještenja da vidite detalje. "
 
+<<<<<<< po/bs.po
+=======
+#. Create and show the notification
+#: ../src/avahi.c:16
+msgid "Network service discovery disabled"
+msgstr "Iksljučeno je otkrivanje mrežnih usluga"
+
+#: ../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 ""
+"Vaša trenutna mreža je u .local domenu, što se ne preporučuje i u "
+"nesaglasnosti  je sa otkrivanjem mrežnih usluga Avahi. Usluga je isključena."
+
+>>>>>>> po/bs.po
 #: ../src/cdroms.c:48
 msgid "Software Packages Volume Detected"
 msgstr "Detektovan je disk sa programskim paketima"
@@ -224,9 +300,14 @@ msgid "No current updates"
 msgstr "- informacije o unaprjeđenjima"
 
 #: ../src/livepatch-tray.c:148
+<<<<<<< po/bs.po
 #, c-format
 msgid "%zd current update"
 msgid_plural "%zd current updates"
+=======
+msgid "%"
+msgid_plural "%"
+>>>>>>> po/bs.po
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -334,20 +415,36 @@ msgstr ""
 msgid "A problem occurred when checking for the updates."
 msgstr "Desio se problem u toku provjere nadogradnji."
 
+<<<<<<< po/bs.po
 #: ../src/update-notifier.c:560
 msgid "- inform about updates"
 msgstr "- informacije o unaprjeđenjima"
 
 #: ../src/update-notifier.c:562
+=======
+#: ../src/update-notifier.c:585
+msgid "- inform about updates"
+msgstr "- informacije o unaprjeđenjima"
+
+#: ../src/update-notifier.c:587
+>>>>>>> po/bs.po
 #, c-format
 msgid "Failed to init the UI: %s\n"
 msgstr "Započinjanje Korisničkog Sučelja nije uspjelo: %s\n"
 
+<<<<<<< po/bs.po
 #: ../src/update-notifier.c:563
 msgid "unknown error"
 msgstr "nepoznata greška"
 
 #: ../src/update-notifier.c:590
+=======
+#: ../src/update-notifier.c:588
+msgid "unknown error"
+msgstr "nepoznata greška"
+
+#: ../src/update-notifier.c:615
+>>>>>>> po/bs.po
 msgid "update-notifier"
 msgstr "obavještavač o dopunama"
 
@@ -417,12 +514,15 @@ msgstr ""
 "sistemu. Morate popraviti Internet konekciju, ukloniti i reinstalirati "
 "pakete da popravite problem."
 
+<<<<<<< po/bs.po
 #~ msgid "%i package can be updated."
 #~ msgid_plural "%i packages can be updated."
 #~ msgstr[0] "%i paket može biti osvježen"
 #~ msgstr[1] "%i paketa mogu biti osvježena"
 #~ msgstr[2] "%i paketa može biti osvježeno"
 
+=======
+>>>>>>> po/bs.po
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">Please enter your password to "
 #~ "access problem reports of system programs</span>"
@@ -430,6 +530,7 @@ msgstr ""
 #~ "<span weight=\"bold\" size=\"larger\">Unesite vašu lozinku da pristupite "
 #~ "prijavljivanju problema sistemskih programa</span>"
 
+<<<<<<< po/bs.po
 #~ msgid "Network service discovery disabled"
 #~ msgstr "Iksljučeno je otkrivanje mrežnih usluga"
 
@@ -442,6 +543,8 @@ msgstr ""
 #~ "nesaglasnosti  je sa otkrivanjem mrežnih usluga Avahi. Usluga je "
 #~ "isključena."
 
+=======
+>>>>>>> po/bs.po
 #~ msgid "Addon volume detected"
 #~ msgstr "Primjećen je disk sa dodacima"
 
diff --git a/po/ca.po b/po/ca.po
index 16b181d..3021c92 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-notifier\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< po/ca.po
 "POT-Creation-Date: 2020-11-12 23:53+0000\n"
+=======
+"POT-Creation-Date: 2020-11-19 05:20+0000\n"
+>>>>>>> po/ca.po
 "PO-Revision-Date: 2012-04-16 13:09+0000\n"
 "Last-Translator: Joan Duran <[e-mail]>\n"
 "Language-Team: Catalan <[e-mail]>\n"
@@ -33,6 +37,7 @@ msgid "UA Infra: Extended Security Maintenance (ESM) is not enabled."
 msgstr ""
 
 #: ../data/apt_check.py:93
+<<<<<<< po/ca.po
 #, fuzzy, python-format
 msgid "%i update can be installed immediately."
 msgid_plural "%i updates can be installed immediately."
@@ -40,30 +45,52 @@ msgstr[0] "%i actualització és una actualització de seguretat."
 msgstr[1] "%i actualitzacions són actualitzacions de seguretat."
 
 #: ../data/apt_check.py:101
+=======
+#, python-format
+msgid "%i package can be updated."
+msgid_plural "%i packages can be updated."
+msgstr[0] "Podeu actualitzar %i paquet."
+msgstr[1] "Podeu actualitzar %i paquets."
+
+#: ../data/apt_check.py:99
+>>>>>>> po/ca.po
 #, 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] ""
 
+<<<<<<< po/ca.po
 #: ../data/apt_check.py:110
+=======
+#: ../data/apt_check.py:108
+>>>>>>> po/ca.po
 #, fuzzy, python-format
 msgid "%i of these updates is a security update."
 msgid_plural "%i of these updates are security updates."
 msgstr[0] "%i actualització és una actualització de seguretat."
 msgstr[1] "%i actualitzacions són actualitzacions de seguretat."
 
+<<<<<<< po/ca.po
 #: ../data/apt_check.py:119
 msgid "To see these additional updates run: apt list --upgradable"
 msgstr ""
 
 #: ../data/apt_check.py:126
+=======
+#: ../data/apt_check.py:117
+msgid "To see these additional updates run: apt list --upgradable"
+msgstr ""
+
+#: ../data/apt_check.py:124
+>>>>>>> po/ca.po
 #, 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] ""
 
+<<<<<<< po/ca.po
 #: ../data/apt_check.py:137
 msgid "Enable UA Infra: ESM to receive additional future security updates."
 msgstr ""
@@ -73,19 +100,39 @@ msgid "See https://ubuntu.com/security/esm or run: sudo ua status"
 msgstr ""
 
 #: ../data/apt_check.py:184
+=======
+#: ../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:182
+>>>>>>> po/ca.po
 #, python-format
 msgid "Error: Opening the cache (%s)"
 msgstr "S'ha produït un error en obrir la memòria cau (%s)"
 
+<<<<<<< po/ca.po
 #: ../data/apt_check.py:194
 msgid "Error: BrokenCount > 0"
 msgstr "S'ha produït un error: BrokenCount > 0"
 
 #: ../data/apt_check.py:201
+=======
+#: ../data/apt_check.py:192
+msgid "Error: BrokenCount > 0"
+msgstr "S'ha produït un error: BrokenCount > 0"
+
+#: ../data/apt_check.py:199
+>>>>>>> po/ca.po
 #, python-format
 msgid "Error: Marking the upgrade (%s)"
 msgstr "S'ha produït un error en marcar l'actualització (%s)"
 
+<<<<<<< po/ca.po
 #: ../data/apt_check.py:310
 msgid "Show the packages that are going to be installed/upgraded"
 msgstr "Mostra els paquets que s'instal·laran o s'actualitzaran"
@@ -95,6 +142,17 @@ msgid "Show human readable output on stdout"
 msgstr "Mostra una sortida llegible per a la sortida estàndard"
 
 #: ../data/apt_check.py:320
+=======
+#: ../data/apt_check.py:309
+msgid "Show the packages that are going to be installed/upgraded"
+msgstr "Mostra els paquets que s'instal·laran o s'actualitzaran"
+
+#: ../data/apt_check.py:315
+msgid "Show human readable output on stdout"
+msgstr "Mostra una sortida llegible per a la sortida estàndard"
+
+#: ../data/apt_check.py:319
+>>>>>>> po/ca.po
 msgid ""
 "Return the time in days when security updates are installed unattended (0 "
 "means disabled)"
@@ -126,6 +184,24 @@ msgstr ""
 "Una aplicació del sistema ha fallat (ara o anteriorment). Feu clic a la "
 "icona de notificació per a visualitzar-ne els detalls. "
 
+<<<<<<< po/ca.po
+=======
+#. Create and show the notification
+#: ../src/avahi.c:16
+msgid "Network service discovery disabled"
+msgstr "El servei de descoberta de serveis a la xarxa està inhabilitat"
+
+#: ../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 ""
+"La vostra xarxa actual té un domini .local, que no és recomanat i és "
+"incompatible amb la descoberta de serveis a la xarxa Avahi. S'ha inhabilitat "
+"el servei."
+
+>>>>>>> po/ca.po
 #: ../src/cdroms.c:48
 msgid "Software Packages Volume Detected"
 msgstr "S'ha detectat un volum de paquets de programari"
@@ -222,9 +298,14 @@ msgid "No current updates"
 msgstr "- informa sobre les actualitzacions"
 
 #: ../src/livepatch-tray.c:148
+<<<<<<< po/ca.po
 #, c-format
 msgid "%zd current update"
 msgid_plural "%zd current updates"
+=======
+msgid "%"
+msgid_plural "%"
+>>>>>>> po/ca.po
 msgstr[0] ""
 msgstr[1] ""
 
@@ -330,20 +411,36 @@ msgstr ""
 msgid "A problem occurred when checking for the updates."
 msgstr "S'ha produït un error en comprovar les actualitzacions."
 
+<<<<<<< po/ca.po
 #: ../src/update-notifier.c:560
 msgid "- inform about updates"
 msgstr "- informa sobre les actualitzacions"
 
 #: ../src/update-notifier.c:562
+=======
+#: ../src/update-notifier.c:585
+msgid "- inform about updates"
+msgstr "- informa sobre les actualitzacions"
+
+#: ../src/update-notifier.c:587
+>>>>>>> po/ca.po
 #, c-format
 msgid "Failed to init the UI: %s\n"
 msgstr "Ha fallat la inicialització de la interfície d'usuari: %s\n"
 
+<<<<<<< po/ca.po
 #: ../src/update-notifier.c:563
 msgid "unknown error"
 msgstr "error desconegut"
 
 #: ../src/update-notifier.c:590
+=======
+#: ../src/update-notifier.c:588
+msgid "unknown error"
+msgstr "error desconegut"
+
+#: ../src/update-notifier.c:615
+>>>>>>> po/ca.po
 msgid "update-notifier"
 msgstr "indicador d'actualitzacions"
 
@@ -414,11 +511,14 @@ msgstr ""
 "vostre sistema. Heu d'arreglar la connexió a Internet, després suprimir i "
 "tornar a instal·lar els paquets per solucionar aquest problema."
 
+<<<<<<< po/ca.po
 #~ msgid "%i package can be updated."
 #~ msgid_plural "%i packages can be updated."
 #~ msgstr[0] "Podeu actualitzar %i paquet."
 #~ msgstr[1] "Podeu actualitzar %i paquets."
 
+=======
+>>>>>>> po/ca.po
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">Please enter your password to "
 #~ "access problem reports of system programs</span>"
@@ -426,6 +526,7 @@ msgstr ""
 #~ "<span weight=\"bold\" size=\"larger\">Introduïu la contrasenya per a "
 #~ "accedir als informes de problemes dels programes del sistema</span>"
 
+<<<<<<< po/ca.po
 #~ msgid "Network service discovery disabled"
 #~ msgstr "El servei de descoberta de serveis a la xarxa està inhabilitat"
 
@@ -438,6 +539,8 @@ msgstr ""
 #~ "incompatible amb la descoberta de serveis a la xarxa Avahi. S'ha "
 #~ "inhabilitat el servei."
 
+=======
+>>>>>>> po/ca.po
 #~ msgid "Addon volume detected"
 #~ msgstr "S'ha detectat un volum de complements"
 
diff --git a/po/[e-mail] b/po/[e-mail]
index e510b43..80107dd 100644
--- a/po/[e-mail]
+++ b/po/[e-mail]
@@ -7,7 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-notifier\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< po/[e-mail]
 "POT-Creation-Date: 2020-11-12 23:53+0000\n"
+=======
+"POT-Creation-Date: 2020-11-19 05:20+0000\n"
+>>>>>>> po/[e-mail]
 "PO-Revision-Date: 2012-10-19 09:35+0000\n"
 "Last-Translator: Joan Duran <[e-mail]>\n"
 "Language-Team: Catalan <[e-mail]>\n"
@@ -33,6 +37,7 @@ msgid "UA Infra: Extended Security Maintenance (ESM) is not enabled."
 msgstr ""
 
 #: ../data/apt_check.py:93
+<<<<<<< po/[e-mail]
 #, fuzzy, python-format
 msgid "%i update can be installed immediately."
 msgid_plural "%i updates can be installed immediately."
@@ -40,30 +45,52 @@ msgstr[0] "%i actualització és una actualització de seguretat."
 msgstr[1] "%i actualitzacions són actualitzacions de seguretat."
 
 #: ../data/apt_check.py:101
+=======
+#, python-format
+msgid "%i package can be updated."
+msgid_plural "%i packages can be updated."
+msgstr[0] "Podeu actualitzar %i paquet."
+msgstr[1] "Podeu actualitzar %i paquets."
+
+#: ../data/apt_check.py:99
+>>>>>>> po/[e-mail]
 #, 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] ""
 
+<<<<<<< po/[e-mail]
 #: ../data/apt_check.py:110
+=======
+#: ../data/apt_check.py:108
+>>>>>>> po/[e-mail]
 #, fuzzy, python-format
 msgid "%i of these updates is a security update."
 msgid_plural "%i of these updates are security updates."
 msgstr[0] "%i actualització és una actualització de seguretat."
 msgstr[1] "%i actualitzacions són actualitzacions de seguretat."
 
+<<<<<<< po/[e-mail]
 #: ../data/apt_check.py:119
 msgid "To see these additional updates run: apt list --upgradable"
 msgstr ""
 
 #: ../data/apt_check.py:126
+=======
+#: ../data/apt_check.py:117
+msgid "To see these additional updates run: apt list --upgradable"
+msgstr ""
+
+#: ../data/apt_check.py:124
+>>>>>>> po/[e-mail]
 #, 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] ""
 
+<<<<<<< po/[e-mail]
 #: ../data/apt_check.py:137
 msgid "Enable UA Infra: ESM to receive additional future security updates."
 msgstr ""
@@ -73,19 +100,39 @@ msgid "See https://ubuntu.com/security/esm or run: sudo ua status"
 msgstr ""
 
 #: ../data/apt_check.py:184
+=======
+#: ../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:182
+>>>>>>> po/[e-mail]
 #, python-format
 msgid "Error: Opening the cache (%s)"
 msgstr "S'ha produït un error en obrir la memòria cau (%s)"
 
+<<<<<<< po/[e-mail]
 #: ../data/apt_check.py:194
 msgid "Error: BrokenCount > 0"
 msgstr "S'ha produït un error: BrokenCount > 0"
 
 #: ../data/apt_check.py:201
+=======
+#: ../data/apt_check.py:192
+msgid "Error: BrokenCount > 0"
+msgstr "S'ha produït un error: BrokenCount > 0"
+
+#: ../data/apt_check.py:199
+>>>>>>> po/[e-mail]
 #, python-format
 msgid "Error: Marking the upgrade (%s)"
 msgstr "S'ha produït un error en marcar l'actualització (%s)"
 
+<<<<<<< po/[e-mail]
 #: ../data/apt_check.py:310
 msgid "Show the packages that are going to be installed/upgraded"
 msgstr "Mostra els paquets que s'instal·laran o s'actualitzaran"
@@ -95,6 +142,17 @@ msgid "Show human readable output on stdout"
 msgstr "Mostra una eixida llegible per a l'eixida estàndard"
 
 #: ../data/apt_check.py:320
+=======
+#: ../data/apt_check.py:309
+msgid "Show the packages that are going to be installed/upgraded"
+msgstr "Mostra els paquets que s'instal·laran o s'actualitzaran"
+
+#: ../data/apt_check.py:315
+msgid "Show human readable output on stdout"
+msgstr "Mostra una eixida llegible per a l'eixida estàndard"
+
+#: ../data/apt_check.py:319
+>>>>>>> po/[e-mail]
 msgid ""
 "Return the time in days when security updates are installed unattended (0 "
 "means disabled)"
@@ -126,6 +184,24 @@ msgstr ""
 "Una aplicació del sistema ha fallat (ara o anteriorment). Feu clic a la "
 "icona de notificació per a visualitzar-ne els detalls. "
 
+<<<<<<< po/[e-mail]
+=======
+#. Create and show the notification
+#: ../src/avahi.c:16
+msgid "Network service discovery disabled"
+msgstr "El servei de descoberta de serveis a la xarxa està inhabilitat"
+
+#: ../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 ""
+"La vostra xarxa actual té un domini .local, que no és recomanat i és "
+"incompatible amb la descoberta de serveis a la xarxa Avahi. S'ha inhabilitat "
+"el servei."
+
+>>>>>>> po/[e-mail]
 #: ../src/cdroms.c:48
 msgid "Software Packages Volume Detected"
 msgstr "S'ha detectat un volum de paquets de programari"
@@ -222,9 +298,14 @@ msgid "No current updates"
 msgstr "- informa sobre les actualitzacions"
 
 #: ../src/livepatch-tray.c:148
+<<<<<<< po/[e-mail]
 #, c-format
 msgid "%zd current update"
 msgid_plural "%zd current updates"
+=======
+msgid "%"
+msgid_plural "%"
+>>>>>>> po/[e-mail]
 msgstr[0] ""
 msgstr[1] ""
 
@@ -330,20 +411,36 @@ msgstr ""
 msgid "A problem occurred when checking for the updates."
 msgstr "S'ha produït un error en comprovar les actualitzacions."
 
+<<<<<<< po/[e-mail]
 #: ../src/update-notifier.c:560
 msgid "- inform about updates"
 msgstr "- informa sobre les actualitzacions"
 
 #: ../src/update-notifier.c:562
+=======
+#: ../src/update-notifier.c:585
+msgid "- inform about updates"
+msgstr "- informa sobre les actualitzacions"
+
+#: ../src/update-notifier.c:587
+>>>>>>> po/[e-mail]
 #, c-format
 msgid "Failed to init the UI: %s\n"
 msgstr "Ha fallat la inicialització de la interfície d'usuari: %s\n"
 
+<<<<<<< po/[e-mail]
 #: ../src/update-notifier.c:563
 msgid "unknown error"
 msgstr "error desconegut"
 
 #: ../src/update-notifier.c:590
+=======
+#: ../src/update-notifier.c:588
+msgid "unknown error"
+msgstr "error desconegut"
+
+#: ../src/update-notifier.c:615
+>>>>>>> po/[e-mail]
 msgid "update-notifier"
 msgstr "indicador d'actualitzacions"
 
@@ -414,11 +511,14 @@ msgstr ""
 "vostre sistema. Heu d'arreglar la connexió a Internet, després suprimir i "
 "tornar a instal·lar els paquets per solucionar este problema."
 
+<<<<<<< po/[e-mail]
 #~ msgid "%i package can be updated."
 #~ msgid_plural "%i packages can be updated."
 #~ msgstr[0] "Podeu actualitzar %i paquet."
 #~ msgstr[1] "Podeu actualitzar %i paquets."
 
+=======
+>>>>>>> po/[e-mail]
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">Please enter your password to "
 #~ "access problem reports of system programs</span>"
@@ -426,6 +526,7 @@ msgstr ""
 #~ "<span weight=\"bold\" size=\"larger\">Introduïu la contrasenya per a "
 #~ "accedir als informes de problemes dels programes del sistema</span>"
 
+<<<<<<< po/[e-mail]
 #~ msgid "Network service discovery disabled"
 #~ msgstr "El servei de descoberta de serveis a la xarxa està inhabilitat"
 
@@ -438,6 +539,8 @@ msgstr ""
 #~ "incompatible amb la descoberta de serveis a la xarxa Avahi. S'ha "
 #~ "inhabilitat el servei."
 
+=======
+>>>>>>> po/[e-mail]
 #~ msgid "Addon volume detected"
 #~ msgstr "S'ha detectat un volum de complements"
 
diff --git a/po/ckb.po b/po/ckb.po
index 20ca21a..a5dee2f 100644
--- a/po/ckb.po
+++ b/po/ckb.po
@@ -7,7 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-notifier\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< po/ckb.po
 "POT-Creation-Date: 2020-11-12 23:53+0000\n"
+=======
+"POT-Creation-Date: 2020-11-19 05:20+0000\n"
+>>>>>>> po/ckb.po
 "PO-Revision-Date: 2008-10-26 11:56+0000\n"
 "Last-Translator: jwtear nariman <[e-mail]>\n"
 "Language-Team: Kurdish (Sorani) <[e-mail]>\n"
@@ -34,36 +38,58 @@ msgstr ""
 
 #: ../data/apt_check.py:93
 #, python-format
+<<<<<<< po/ckb.po
 msgid "%i update can be installed immediately."
 msgid_plural "%i updates can be installed immediately."
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../data/apt_check.py:101
+=======
+msgid "%i package can be updated."
+msgid_plural "%i packages can be updated."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../data/apt_check.py:99
+>>>>>>> po/ckb.po
 #, 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] ""
 
+<<<<<<< po/ckb.po
 #: ../data/apt_check.py:110
+=======
+#: ../data/apt_check.py:108
+>>>>>>> po/ckb.po
 #, python-format
 msgid "%i of these updates is a security update."
 msgid_plural "%i of these updates are security updates."
 msgstr[0] ""
 msgstr[1] ""
 
+<<<<<<< po/ckb.po
 #: ../data/apt_check.py:119
 msgid "To see these additional updates run: apt list --upgradable"
 msgstr ""
 
 #: ../data/apt_check.py:126
+=======
+#: ../data/apt_check.py:117
+msgid "To see these additional updates run: apt list --upgradable"
+msgstr ""
+
+#: ../data/apt_check.py:124
+>>>>>>> po/ckb.po
 #, 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] ""
 
+<<<<<<< po/ckb.po
 #: ../data/apt_check.py:137
 msgid "Enable UA Infra: ESM to receive additional future security updates."
 msgstr ""
@@ -73,19 +99,39 @@ msgid "See https://ubuntu.com/security/esm or run: sudo ua status"
 msgstr ""
 
 #: ../data/apt_check.py:184
+=======
+#: ../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:182
+>>>>>>> po/ckb.po
 #, python-format
 msgid "Error: Opening the cache (%s)"
 msgstr ""
 
+<<<<<<< po/ckb.po
 #: ../data/apt_check.py:194
 msgid "Error: BrokenCount > 0"