Merge ~juliank/grub/+git/ubuntu:resilient-boot into ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu

[Julian Andres Klode]

User stories:

* User installs grub
* User upgrades grub

If you have not preseeded grub2/efi_install_devices, we'll transition the device that is currently mounted to /boot/efi into the setting, so that you don't get asked. Doing this on install also keeps existing installers working, they can then add the debconf magic to get resilient boot support.

* User changed /boot/efi to point elsewhere not yet configured as an ESP

We take the current debconf settings, append the device that /boot/efi points to to the list of enabled things, and then prompt the user if that's correct.

* User unmounted /boot/efi

If the user unmounted /boot/efi during upgrade/install, they'll get prompted for which ESPs to install. If the user unmounted /boot/efi otherwise, the device that was mounted there will be mounted to /var/lib/grub/esp as for any other ESP.

* User does not have an ESP-type partition, or the wanted one does not have an ESP identifier

This might happen if the system supports booting from any FAT partition, not just those with magic ESP identifiers. Our installer does not create such partitions, though. The user will see an empty list, or well, at least not the partition they want.

* User mounted sth to /boot/efi that is not an ESP

Similar to before, except the user will get prompted on each upgrade.

* User wants to add an ESP

dpkg-reconfigure grub-efi-amd64

* User removes a configured ESP

The user will get reprompted with the list of ESPs in the system, and any other configured ones preselected.

[Julian Andres Klode (juliank)]

FWIW, I followed os-prober's design on where to mount the ESPs and mounted them to /var/lib/grub/esp, os-prober was doing sth similar in /var/lib/os-prober.

[Julian Andres Klode (juliank)]

I'm happy now, please review.

Use cases:

* New install:
* Upgrade:

If you have not preseeded grub2/efi_install_devices, we'll transition the device that is currently mounted to /boot/efi into the setting, so that you don't get asked. Doing this on install also keeps existing installers working, they can then add the debconf magic to get resilient boot support.

* User changed /boot/efi to point elsewhere not yet configured as an ESP

We take the current debconf settings, append the device that /boot/efi points to to the list of enabled things, and then prompt the user if that's correct.

* User unmounted /boot/efi

If the user unmounted /boot/efi during upgrade/install, they'll get prompted for which ESPs to install. If the user unmounted /boot/efi otherwise, the device that was mounted there will be mounted to /var/lib/grub/esp as for any other ESP.

* User does not have an ESP-type partition, or the wanted one does not have an ESP identifier

This might happen if the system supports booting from any FAT partition, not just those with magic ESP identifiers. Our installer does not create such partitions, though. The user will see an empty list, or well, at least not the partition they want.

* User mounted sth to /boot/efi that is not an ESP

Similar to before, except the user will get prompted on each upgrade.

[Julian Andres Klode (juliank)]

Maybe I should open a FFe bug for this, but it's also a kind of bug fix?

[Julian Andres Klode (juliank)]

@raharper could use some review of the debconf keys. The logic for installers is to continue to mount one ESP to /boot/efi, and add all other disks using their /dev/disk/by-id/ alias to the grub2/efi_install_devices key.

[Steve Langasek (vorlon)]

I see that you commented in the spec that you were moving the invocation of multiple targets into a wrapper script instead of modifying the C code. FTR this comment did not result in any notifications to me.

The problem with doing this in a wrapper script, and why I originally insisted on this being done in grub-install, is that grub-install is also the tool that on EFI systems populates the BootXXXX and BootOrder nvram variables. If we are not passing an ordered list of target devices to grub-install, then it does not know what to do with the nvram contents wrt recording primary and fallback options. So doing this in a wrapper script cannot actually provide the bootloader resiliency that we are looking for here.

review: Needs Fixing

[Julian Andres Klode (juliank)]

Now the thing is that you cannot specify an order in debconf prompts either, so while the installer can do such a thing, and while you can manually set the selection, as soon as you get reprompted because you changed your ESPs, the order will be changed anyway (I believe it's alphabetically by device id).

The only guarantee we could make is that you can mount /boot/efi to what your preferred ESP is, and otherwise it's going to be hell.

But looking at the code, it actually seems to delete any other boot entry for ubuntu, so that's not really helpful. This confuses me, because I'd expect to be able to install two instances of ubuntu on two hard disks and not have them constantly delete each other's bootloader entries.

[Julian Andres Klode (juliank)]

In any case we still need the wrapper script - only the block that runs grub-install needs to be changed to pass the devices to grub-install.

However, there is another problem with passing a list of devices to grub-install: We can't tell you which device failed to install, so if we reprompt you on a failure, you won't know what you need to do. That's why grub-pc runs them in a loop too.

I'm not sure how to proceed. Modifying grub-install to take a list of devices and loop over them and install to all of them seems out of the question, as it has a lot of global state that needs to be stored in a per-device array, function signatures need to be changed to accept arrays of new structs instead of multiple arguments, and getting this sorted out before focal does not seem feasible.

So I was thinking we could pass it a list of all ESPs for each invocation, and then we only remove entries that do not belong to any of those ESPs. Then each grub-install invocation will only change it's own boot entry, essentially. That should be strictly a subset of the other work, and hence have a short turnaround time.

Still does not solve that you don't have an *ordered* list in the debconf entry (multiselect entries are not orderable by the user). But I guess we can give it a distinction between primary and fallback ESPs at the very least, if /boot/efi is mounted.

[Julian Andres Klode (juliank)]

I'm also confused about the previous check to EFI/ubuntu exists on the ESP, because I want people to use the grub-multi-install wrapper to do the initial installation too, until we have this sorted out properly in grub-install (which let's face it, is a lot of work).

Because I can add a hack to grub-install now reasonably quickly, but I don't see that getting a clean solution, because that's touching a lot of places, and that's (a) a lot of work and (b) a huge effort to maintain downstream.

[Julian Andres Klode (juliank)]

I made it super ugly now, but this seems like it works reasonably OK. It just is undefined which ESP is first in the boot order. OK, to be fair, the last entry it adds will be the first one, but don't have to tell people that...

[Julian Andres Klode (juliank)]

I can start making it nice, but it's good to have a fallback that's 90% there but super ugly.

[Julian Andres Klode (juliank)]

Needs

* Rebasing against didrock's changes
* Reinstate the check that we installed grub before / should be installing grub, but this time

cjwatson | Testing for /boot/grub/@FIRST_CPU_PLATFORM@/core.efi might work

[Steve Langasek (vorlon)]

Thanks, a few minor things that I need fixing up before landing.

Upstreaming is a whole other story and I haven't reviewed the changes for that in mind.

review: Needs Fixing

[Julian Andres Klode (juliank)]

Replied to diff comments.

Re upstreaming - that's not even really on the radar. Not even the efivar.c bit we have from Debian is upstreamed yet - upstream uses efibootmgr still :/

diff --git a/debian/.git-dpm b/debian/.git-dpm
index 0f010a9..c41aa95 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-dc4a68e43b8e89285f6b68cfa261713211da73e4
-dc4a68e43b8e89285f6b68cfa261713211da73e4
+8c0357b2b61df26c5b3c715f250e32daaecba460
+8c0357b2b61df26c5b3c715f250e32daaecba460
 578bb115fbd47e1c464696f1f8d6183e5443975d
 578bb115fbd47e1c464696f1f8d6183e5443975d
 grub2_2.04.orig.tar.xz
diff --git a/debian/changelog b/debian/changelog
index 0c7ee68..c9c880b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grub2 (2.04-1ubuntu24) UNRELEASED; urgency=medium
+
+  * Support installing to multiple ESPs.
+
+ -- Julian Andres Klode <[e-mail]>  Thu, 02 Apr 2020 09:37:30 +0200
+
 grub2 (2.04-1ubuntu23) focal; urgency=medium
 
   [ Jean-Baptiste Lallement ]
diff --git a/debian/grub-common.dirs b/debian/grub-common.dirs
index 3d70df4..832239c 100644
--- a/debian/grub-common.dirs
+++ b/debian/grub-common.dirs
@@ -1,2 +1,3 @@
 usr/sbin
 var/lib/grub/ucf
+var/lib/grub/esp
diff --git a/debian/grub-common.install.in b/debian/grub-common.install.in
index d5e5325..6c5c9f0 100644
--- a/debian/grub-common.install.in
+++ b/debian/grub-common.install.in
@@ -2,6 +2,7 @@
 ../../debian/grub.d			etc
 ../../debian/init-select.cfg		etc/default/grub.d
 ../../debian/grub-check-signatures usr/share/grub/
+../../debian/grub-multi-install usr/lib/grub/
 ../../debian/canonical-uefi-ca.crt usr/share/grub/
 
 etc/grub.d
diff --git a/debian/grub-multi-install b/debian/grub-multi-install
new file mode 100755
index 0000000..ed66c1e
--- /dev/null
+++ b/debian/grub-multi-install
@@ -0,0 +1,383 @@
+#!/bin/bash
+#
+# Install to multiple ESPs
+
+set -e
+
+# Most of this is copy-paste from grub postinst, sigh.
+
+. /usr/share/debconf/confmodule
+
+###############################################################################
+#                       COPY FROM POSTINST
+###############################################################################
+# This only works on a Linux system with udev running.  This is probably the
+# vast majority of systems where we need any of this, though, and we fall
+# back reasonably gracefully if we don't have it.
+cached_available_ids=
+available_ids()
+{
+  local id path
+
+  if [ "$cached_available_ids" ]; then
+    echo "$cached_available_ids"
+    return
+  fi
+
+  [ -d /dev/disk/by-id ] || return
+  cached_available_ids="$(
+    for path in /dev/disk/by-id/*; do
+      [ -e "$path" ] || continue
+      printf '%s %s\n' "$path" "$(readlink -f "$path")"
+    done | sort -k2 -s -u | cut -d' ' -f1
+  )"
+  echo "$cached_available_ids"
+}
+
+# Returns non-zero and no output if no mapping can be found.
+device_to_id()
+{
+  local id
+  for id in $(available_ids); do
+    if [ "$(readlink -f "$id")" = "$(readlink -f "$1")" ]; then
+      echo "$id"
+      return 0
+    fi
+  done
+  # Fall back to the plain device name if there's no by-id link for it.
+  if [ -e "$1" ]; then
+    echo "$1"
+    return 0
+  fi
+  return 1
+}
+
+# for Linux
+sysfs_size()
+{
+  local num_sectors sector_size size
+  # Try to find out the size without relying on a partitioning tool being
+  # installed. This isn't too hard on Linux 2.6 with sysfs, but we have to
+  # try a couple of variants on detection of the sector size.
+  if [ -e "$1/size" ]; then
+    num_sectors="$(cat "$1/size")"
+    sector_size=512
+    if [ -e "$1/queue/logical_block_size" ]; then
+      sector_size="$(cat "$1/queue/logical_block_size")"
+    elif [ -e "$1/queue/hw_sector_size" ]; then
+      sector_size="$(cat "$1/queue/hw_sector_size")"
+    fi
+    size="$(expr "$num_sectors" \* "$sector_size" / 1000 / 1000)"
+  fi
+  [ "$size" ] || size='???'
+  echo "$size"
+}
+
+# for kFreeBSD
+camcontrol_size()
+{
+  local num_sectors sector_size size=
+
+  if num_sectors="$(camcontrol readcap "$1" -q -s -N)"; then
+    sector_size="$(camcontrol readcap "$1" -q -b)"
+    size="$(expr "$num_sectors" \* "$sector_size" / 1000 / 1000)"
+  fi
+
+  [ "$size" ] || size='???'
+  echo "$size"
+}
+
+maybe_udevadm()
+{
+  if which udevadm >/dev/null 2>&1; then
+    udevadm "$@" || true
+  fi
+}
+
+# Parse /proc/mounts and find out the mount for the given device.
+# The device must be a real device in /dev, not a symlink to one.
+get_mounted_device()
+{
+  mountpoint="$1"
+  cat /proc/mounts | while read -r line; do
+    set -f
+    set -- $line
+    set +f
+    if [ "$2" = "$mountpoint" ]; then
+      echo "$1"
+      break
+    fi
+  done
+}
+
+###############################################################################
+#                            New or modified helpers
+###############################################################################
+
+# Fixed: Return nothing if the argument is empty
+get_mountpoint()
+{
+  local relpath boot_mountpoint
+
+  if [ -z "$1" ]; then
+    return
+  fi
+
+  relpath="$(grub-mkrelpath "$1")"
+  boot_mountpoint="${1#$relpath}"
+  echo "${boot_mountpoint:-/}"
+}
+
+
+# Returns value in $RET, like a debconf command.
+#
+# Merged version of describe_disk and describe_partition, as disks can't be
+# valid ESPs on their own, so we can't render them as an entry.
+describe_efi_system_partition()
+{
+  local disk part id path sysfs_path diskbase partbase size
+  local disk_basename disk_size model
+  disk="$1"
+  part="$2"
+  id="$3"
+  path="$4"
+
+  # BEGIN: Stolen from describe_disk
+  model=
+  case $(uname -s) in
+    Linux)
+      sysfs_path="$(maybe_udevadm info -n "$disk" -q path)"
+      if [ -z "$sysfs_path" ]; then
+        sysfs_path="/block/$(printf %s "${disk#/dev/}" | sed 's,/,!,g')"
+      fi
+      disk_size="$(sysfs_size "/sys$sysfs_path")"
+
+      model="$(maybe_udevadm info -n "$disk" -q property | sed -n 's/^ID_MODEL=//p')"
+      if [ -z "$model" ]; then
+        model="$(maybe_udevadm info -n "$disk" -q property | sed -n 's/^DM_NAME=//p')"
+        if [ -z "$model" ]; then
+          model="$(maybe_udevadm info -n "$disk" -q property | sed -n 's/^MD_NAME=//p')"
+          if [ -z "$model" ] && which dmsetup >/dev/null 2>&1; then
+            model="$(dmsetup info -c --noheadings -o name "$disk" 2>/dev/null || true)"
+          fi
+        fi
+      fi
+    ;;
+    GNU/kFreeBSD)
+      disk_basename=$(basename "$disk")
+      disk_size="$(camcontrol_size "$disk_basename")"
+      model="$(camcontrol inquiry "$disk_basename" | sed -ne "s/^pass0: <\([^>]*\)>.*/\1/p")"
+    ;;
+  esac
+
+  [ "$model" ] || model='???'
+
+  # END: Stolen from describe_disk
+
+  sysfs_path="$(maybe_udevadm info -n "$part" -q path)"
+  if [ -z "$sysfs_path" ]; then
+    diskbase="${disk#/dev/}"
+    diskbase="$(printf %s "$diskbase" | sed 's,/,!,g')"
+    partbase="${part#/dev/}"
+    partbase="$(printf %s "$partbase" | sed 's,/,!,g')"
+    sysfs_path="/block/$diskbase/$partbase"
+  fi
+  size="$(sysfs_size "/sys$sysfs_path")"
+
+  db_subst grub-efi/partition_description DEVICE "$part"
+  db_subst grub-efi/partition_description SIZE "$size"
+  db_subst grub-efi/partition_description PATH "$path"
+  db_subst grub-efi/partition_description DISK_MODEL "$model"
+  db_subst grub-efi/partition_description DISK_SIZE "$disk_size"
+  db_metaget grub-efi/partition_description description
+}
+
+
+# Parse /proc/mounts and find out the mount for the given device.
+# The device must be a real device in /dev, not a symlink to one.
+find_mount_point()
+{
+  real_device="$1"
+  cat /proc/mounts | while read -r line; do
+    set -f
+    set -- $line
+    set +f
+    if [ "$1" = "$real_device" -a "$3" = "vfat" ]; then
+      echo "$2"
+      break
+    fi
+  done
+}
+
+# Return all devices that are a valid ESP
+usable_efi_system_partitions()
+{
+  local last_partition path partition partition_id
+  local ID_PART_ENTRY_TYPE ID_PART_ENTRY_SCHEME
+
+  last_partition=
+  (
+  for partition in /dev/disk/by-id/*; do
+    eval "$(udevadm info -q property -n "$partition" | grep -E '^ID_PART_ENTRY_(TYPE|SCHEME)=')"
+    if [ -z "$ID_PART_ENTRY_TYPE" -o -z "$ID_PART_ENTRY_SCHEME" -o \
+    \( "$ID_PART_ENTRY_SCHEME" != gpt -a "$ID_PART_ENTRY_SCHEME" != dos \) -o \
+    \( "$ID_PART_ENTRY_SCHEME" = gpt -a "$ID_PART_ENTRY_TYPE" != c12a7328-f81f-11d2-ba4b-00a0c93ec93b \) -o \
+    \( "$ID_PART_ENTRY_SCHEME" = dos -a "$ID_PART_ENTRY_TYPE" != 0xef \) ]; then
+      continue
+    fi
+    # unify the partition id
+    partition_id="$(device_to_id "$partition" || true)"
+    real_device="$(readlink -f "$partition")"
+    path="$(find_mount_point $real_device)"
+    echo "$path:$partition_id"
+  done
+  ) | sort -t: -k2 -u
+}
+
+###############################################################################
+#                            MAGIC SCRIPT
+###############################################################################
+FALLBACK_MOUNTPOINT=/var/lib/grub/esp
+
+# Get configured value
+question=grub-efi/install_devices
+priority=high
+db_get grub-efi/install_devices
+valid=1
+for device in $RET; do
+  if [ ! -e "${device%,}" ]; then
+    valid=0
+    break
+  fi
+done
+
+# If /boot/efi points to a device that's not in the list, trigger the
+# install_devices_disks_changed prompt below, but add the device behind
+# /boot/efi to the defaults.
+boot_efi_device=$(get_mounted_device /boot/efi || true)
+if [ "$boot_efi_device" ]; then
+  for device in $RET; do
+    device="${device%,}"
+    real_device="$(readlink -f "$device" || true)"
+    if [ "$real_device" = "$boot_efi_device" ]; then
+      boot_efi_device=""
+      break
+    fi
+  done
+
+  if [ "$boot_efi_device" ]; then
+    boot_efi_device="$(device_to_id "$boot_efi_device" || true)"
+    if [ "$RET" ]; then
+      RET="$RET, $boot_efi_device"
+    else
+      RET="$boot_efi_device"
+    fi
+    valid=0
+  fi
+fi
+
+
+if [ "$valid" = 0 ]; then
+  question=grub-efi/install_devices_disks_changed
+  priority=critical
+  db_set "$question" "$RET"
+  db_fset "$question" seen false
+  db_fset grub-efi/install_devices_empty seen false
+fi
+
+while :; do
+  ids=
+  descriptions=
+  partitions="$(usable_efi_system_partitions)"
+
+  for partition_pair in $partitions; do
+    partition_id="${partition_pair#*:}"
+    ids="${ids:+$ids, }$partition_id"
+    describe_efi_system_partition "$(readlink -f "$device")" "$(readlink -f "$partition_id")" "$partition_id" "$(get_mountpoint "${partition_pair%%:*}")"
+    RET="$(printf %s "$RET" | sed 's/,/\\,/g')"
+    descriptions="${descriptions:+$descriptions, }$RET"
+  done
+
+  db_subst "$question" RAW_CHOICES "$ids"
+  db_subst "$question" CHOICES "$descriptions"
+  db_input "$priority" "$question" || true
+  db_go
+  db_get "$question"
+
+
+  # Run the installer
+  failed_devices=
+  for i in `echo $RET | sed -e 's/, / /g'` ; do
+    real_device="$(readlink -f "$i")"
+    mntpoint=$(find_mount_point $real_device)
+    if [ -z "$mntpoint" ]; then
+      mntpoint=$FALLBACK_MOUNTPOINT
+      mount $real_device $mntpoint
+    fi
+    echo "Installing grub to $mntpoint." >&2
+    if _UBUNTU_ALTERNATIVE_ESPS="$RET" grub-install --efi-directory=$mntpoint "$@" ; then
+      # We just installed GRUB 2; then also generate grub.cfg.
+      touch /boot/grub/grub.cfg
+    else
+      failed_devices="$failed_devices $real_device"
+    fi
+
+    if [ "$mntpoint" = "$FALLBACK_MOUNTPOINT" ]; then
+      umount $mntpoint
+    fi
+  done
+
+  if [ "$question" != grub-efi/install_devices ] && [ "$RET" ]; then
+    # XXX cjwatson 2019-02-26: The description of
+    # grub-efi/install_devices_disks_changed ought to explain that
+    # selecting no devices will leave the configuration unchanged
+    # so that you'll be prompted again next time, but it's a bit
+    # close to the Debian 10 release to be introducing new
+    # translatable text.  For now, it should be sufficient to
+    # avoid losing configuration data.
+    db_set grub-efi/install_devices "$RET"
+    db_fset grub-efi/install_devices seen true
+  fi
+
+  if [ "$failed_devices" ]; then
+    db_subst grub-efi/install_devices_failed FAILED_DEVICES "$failed_devices"
+    db_fset grub-efi/install_devices_failed seen false
+    if db_input critical grub-efi/install_devices_failed; then
+      db_go
+      db_get grub-efi/install_devices_failed
+      if [ "$RET" = true ]; then
+        break
+      else
+        db_fset "$question" seen false
+        db_fset grub-efi/install_devices_failed seen false
+        continue
+      fi
+    else
+      break # noninteractive
+    fi
+  fi
+
+  db_get "$question"
+  if [ -z "$RET" ]; then
+    # Reset the seen flag if the current answer is false, since
+    # otherwise we'll loop with no indication of why.
+    db_get grub-efi/install_devices_empty
+    if [ "$RET" = false ]; then
+      db_fset grub-efi/install_devices_empty seen false
+    fi
+    if db_input critical grub-efi/install_devices_empty; then
+      db_go
+      db_get grub-efi/install_devices_empty
+      if [ "$RET" = true ]; then
+        break
+      else
+        db_fset "$question" seen false
+        db_fset grub-efi/install_devices_empty seen false
+      fi
+    else
+      break # noninteractive
+    fi
+  else
+    break
+  fi
+done
diff --git a/debian/patches/series b/debian/patches/series
index d1dc6d3..1bf2e9d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -76,3 +76,5 @@ cherrypick-lsefisystab-show-dtb.patch
 0076-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch
 0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch
 0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch
+ubuntu-resilient-boot-ignore-alternative-esps.patch
+ubuntu-resilient-boot-boot-order.patch
diff --git a/debian/patches/ubuntu-resilient-boot-boot-order.patch b/debian/patches/ubuntu-resilient-boot-boot-order.patch
new file mode 100644
index 0000000..dd20c12
--- /dev/null
+++ b/debian/patches/ubuntu-resilient-boot-boot-order.patch
@@ -0,0 +1,231 @@
+From 8c0357b2b61df26c5b3c715f250e32daaecba460 Mon Sep 17 00:00:00 2001
+From: Julian Andres Klode <[e-mail]>
+Date: Wed, 8 Apr 2020 11:05:25 +0200
+Subject: UBUNTU: efivar: Correctly handle boot order of multiple ESPs
+
+Modify the code to insert the ESP mounted to /boot/efi (the *primary*
+ESP) as the first item, but any other ESP after any other of _our_
+ESPs.
+
+So assume we have three ESPs A, B, C (_ours_), and three other
+boot entries X, Y, Z. We configure A, B, and C in that order,
+though some might already be in it, some examples:
+
+	XYZ -> ABCXYZ  (A is added to front, B after it, C after B)
+	BXCYZ -> ABXCYZ (A is added to front, B and C remain unchanged)
+	AXCYZ -> AXCBYZ  (the previously unconfigured ESP B is added after last ESP C)
+
+Doing this requires us passing the path of the ESP directory down to
+the code doing the install, so it can then check whether it was the
+primary ESP - that is, mounted to /boot/efi - or not.
+
+Patch-Name: ubuntu-resilient-boot-boot-order.patch
+---
+ grub-core/osdep/basic/no_platform.c |  2 +-
+ grub-core/osdep/unix/efivar.c       | 48 +++++++++++++++++++++++++----
+ grub-core/osdep/unix/platform.c     |  6 ++--
+ grub-core/osdep/windows/platform.c  |  2 +-
+ include/grub/util/install.h         | 17 +++++-----
+ util/grub-install.c                 |  8 ++---
+ 6 files changed, 59 insertions(+), 24 deletions(-)
+
+diff --git a/grub-core/osdep/basic/no_platform.c b/grub-core/osdep/basic/no_platform.c
+index d76c34c14..152a32873 100644
+--- a/grub-core/osdep/basic/no_platform.c
++++ b/grub-core/osdep/basic/no_platform.c
+@@ -31,7 +31,7 @@ grub_install_register_ieee1275 (int is_prep, const char *install_device,
+ }
+ 
+ void
+-grub_install_register_efi (grub_device_t efidir_grub_dev,
++grub_install_register_efi (grub_device_t efidir_grub_dev, const char *efidir,
+ 			   const char *efifile_path,
+ 			   const char *efi_distributor)
+ {
+diff --git a/grub-core/osdep/unix/efivar.c b/grub-core/osdep/unix/efivar.c
+index 41d39c448..d34df0f70 100644
+--- a/grub-core/osdep/unix/efivar.c
++++ b/grub-core/osdep/unix/efivar.c
+@@ -266,9 +266,10 @@ remove_from_boot_order (struct efi_variable *order, uint16_t num)
+ }
+ 
+ static void
+-add_to_boot_order (struct efi_variable *order, uint16_t num)
++add_to_boot_order (struct efi_variable *order, uint16_t num,
++		   uint16_t *alt_nums, size_t n_alt_nums, bool is_boot_efi)
+ {
+-  int i;
++  int i, j, position = -1;
+   size_t new_data_size;
+   uint8_t *new_data;
+ 
+@@ -278,10 +279,36 @@ add_to_boot_order (struct efi_variable *order, uint16_t num)
+     if (GET_ORDER (order->data, i) == num)
+       return;
+ 
++  if (!is_boot_efi)
++    {
++      for (i = 0; i < order->data_size / sizeof (uint16_t); ++i)
++	for (j = 0; j < n_alt_nums; j++)
++	  if (GET_ORDER (order->data, i) == alt_nums[j])
++	    position = i;
++    }
++
+   new_data_size = order->data_size + sizeof (uint16_t);
+   new_data = xmalloc (new_data_size);
+-  SET_ORDER (new_data, 0, num);
+-  memcpy (new_data + sizeof (uint16_t), order->data, order->data_size);
++
++  if (position != -1)
++    {
++      /* So we should be inserting after something else, as we're not the
++	 preferred ESP. Could write this as memcpy(), but this is far more
++	 readable. */
++      for (i = 0; i <= position; ++i)
++	SET_ORDER (new_data, i, GET_ORDER (order->data, i));
++
++      SET_ORDER (new_data, position + 1, num);
++
++      for (i = position + 1; i < order->data_size / sizeof (uint16_t); ++i)
++	SET_ORDER (new_data, i + 1, GET_ORDER (order->data, i));
++    }
++  else
++    {
++      SET_ORDER (new_data, 0, num);
++      memcpy (new_data + sizeof (uint16_t), order->data, order->data_size);
++    }
++
+   free (order->data);
+   order->data = new_data;
+   order->data_size = new_data_size;
+@@ -486,7 +513,7 @@ devices_equal (const_efidp a, const_efidp b)
+ 
+ int
+ grub_install_efivar_register_efi (grub_device_t efidir_grub_dev,
+-				  const char *efifile_path,
++				  const char *efidir, const char *efifile_path,
+ 				  const char *efi_distributor)
+ {
+   const char *efidir_disk;
+@@ -496,8 +523,12 @@ grub_install_efivar_register_efi (grub_device_t efidir_grub_dev,
+   efidp *alternatives;
+   efidp this;
+   int entry_num = -1;
++  uint16_t *alt_nums = NULL;
++  size_t n_alt_nums = 0;
+   int rc;
++  bool is_boot_efi;
+ 
++  is_boot_efi = strstr (efidir, "/boot/efi") != NULL;
+   efidir_disk = grub_util_biosdisk_get_osdev (efidir_grub_dev->disk);
+   efidir_part = efidir_grub_dev->disk->partition ? efidir_grub_dev->disk->partition->number + 1 : 1;
+   alternatives = get_alternative_esps ();
+@@ -576,6 +607,10 @@ grub_install_efivar_register_efi (grub_device_t efidir_grub_dev,
+ 	    {
+ 	      grub_util_info ("not deleting alternative EFI variable %s (%s)",
+ 			      entry->name, label);
++
++	      alt_nums
++		  = xrealloc (alt_nums, (++n_alt_nums) * sizeof (*alt_nums));
++	      alt_nums[n_alt_nums - 1] = entry->num;
+ 	      continue;
+ 	    }
+ 	}
+@@ -611,7 +646,8 @@ grub_install_efivar_register_efi (grub_device_t efidir_grub_dev,
+   if (rc < 0)
+     goto err;
+ 
+-  add_to_boot_order (order, (uint16_t) entry_num);
++  add_to_boot_order (order, (uint16_t)entry_num, alt_nums, n_alt_nums,
++		     is_boot_efi);
+ 
+   grub_util_info ("setting EFI variable BootOrder");
+   rc = set_efi_variable ("BootOrder", order);
+diff --git a/grub-core/osdep/unix/platform.c b/grub-core/osdep/unix/platform.c
+index b561174ea..a5267db68 100644
+--- a/grub-core/osdep/unix/platform.c
++++ b/grub-core/osdep/unix/platform.c
+@@ -76,13 +76,13 @@ get_ofpathname (const char *dev)
+ }
+ 
+ int
+-grub_install_register_efi (grub_device_t efidir_grub_dev,
++grub_install_register_efi (grub_device_t efidir_grub_dev, const char *efidir,
+ 			   const char *efifile_path,
+ 			   const char *efi_distributor)
+ {
+ #ifdef HAVE_EFIVAR
+-  return grub_install_efivar_register_efi (efidir_grub_dev, efifile_path,
+-					   efi_distributor);
++  return grub_install_efivar_register_efi (efidir_grub_dev, efidir,
++					   efifile_path, efi_distributor);
+ #else
+   grub_util_error ("%s",
+ 		   _("GRUB was not built with efivar support; "
+diff --git a/grub-core/osdep/windows/platform.c b/grub-core/osdep/windows/platform.c
+index e19a3d9a8..a3f738fb9 100644
+--- a/grub-core/osdep/windows/platform.c
++++ b/grub-core/osdep/windows/platform.c
+@@ -208,7 +208,7 @@ set_efi_variable_bootn (grub_uint16_t n, void *in, grub_size_t len)
+ }
+ 
+ int
+-grub_install_register_efi (grub_device_t efidir_grub_dev,
++grub_install_register_efi (grub_device_t efidir_grub_dev, const char *efidir,
+ 			   const char *efifile_path,
+ 			   const char *efi_distributor)
+ {
+diff --git a/include/grub/util/install.h b/include/grub/util/install.h
+index a521f1663..b2ed88e38 100644
+--- a/include/grub/util/install.h
++++ b/include/grub/util/install.h
+@@ -219,15 +219,14 @@ grub_install_get_default_x86_platform (void);
+ const char *
+ grub_install_get_default_powerpc_machtype (void);
+ 
+-int
+-grub_install_efivar_register_efi (grub_device_t efidir_grub_dev,
+-				  const char *efifile_path,
+-				  const char *efi_distributor);
+-
+-int
+-grub_install_register_efi (grub_device_t efidir_grub_dev,
+-			   const char *efifile_path,
+-			   const char *efi_distributor);
++int grub_install_efivar_register_efi (grub_device_t efidir_grub_dev,
++				      const char *efidir,
++				      const char *efifile_path,
++				      const char *efi_distributor);
++
++int grub_install_register_efi (grub_device_t efidir_grub_dev,
++			       const char *efidir, const char *efifile_path,
++			       const char *efi_distributor);
+ 
+ void
+ grub_install_register_ieee1275 (int is_prep, const char *install_device,
+diff --git a/util/grub-install.c b/util/grub-install.c
+index bf8eb65b3..f408b1986 100644
+--- a/util/grub-install.c
++++ b/util/grub-install.c
+@@ -2083,9 +2083,9 @@ main (int argc, char *argv[])
+ 	    {
+ 	      /* Try to make this image bootable using the EFI Boot Manager, if available.  */
+ 	      int ret;
+-	      ret = grub_install_register_efi (efidir_grub_dev,
+-					       "\\System\\Library\\CoreServices",
+-					       efi_distributor);
++	      ret = grub_install_register_efi (
++		  efidir_grub_dev, efidir, "\\System\\Library\\CoreServices",
++		  efi_distributor);
+ 	      if (ret)
+ 	        grub_util_error (_("failed to register the EFI boot entry: %s"),
+ 				 strerror (ret));
+@@ -2201,7 +2201,7 @@ main (int argc, char *argv[])
+ 			  efidir_grub_dev->disk->name,
+ 			  (part ? ",": ""), (part ? : ""));
+ 	  grub_free (part);
+-	  ret = grub_install_register_efi (efidir_grub_dev,
++	  ret = grub_install_register_efi (efidir_grub_dev, efidir,
+ 					   efifile_path, efi_distributor);
+ 	  if (ret)
+ 	    grub_util_error (_("failed to register the EFI boot entry: %s"),
diff --git a/debian/patches/ubuntu-resilient-boot-ignore-alternative-esps.patch b/debian/patches/ubuntu-resilient-boot-ignore-alternative-esps.patch
new file mode 100644
index 0000000..a98eff6
--- /dev/null
+++ b/debian/patches/ubuntu-resilient-boot-ignore-alternative-esps.patch
@@ -0,0 +1,208 @@
+From 3ec2ec2dbe79b52ecfafc797058d2bd82e048593 Mon Sep 17 00:00:00 2001
+From: Julian Andres Klode <[e-mail]>
+Date: Fri, 3 Apr 2020 13:43:49 +0200
+Subject: UBUNTU: efivar: Ignore alternative ESPs
+
+This is an ugly hack to get resilient boot somewhat working:
+We pass in a list of all ESPS in _UBUNTU_ALTERNATIVE_ESPS, and
+then we ignore those when looking for entries to change/remove.
+
+Patch-Name: ubuntu-resilient-boot-ignore-alternative-esps.patch
+---
+ grub-core/osdep/unix/efivar.c | 130 ++++++++++++++++++++++++++++++++--
+ 1 file changed, 125 insertions(+), 5 deletions(-)
+
+diff --git a/grub-core/osdep/unix/efivar.c b/grub-core/osdep/unix/efivar.c
+index 4a58328b4..41d39c448 100644
+--- a/grub-core/osdep/unix/efivar.c
++++ b/grub-core/osdep/unix/efivar.c
+@@ -37,9 +37,11 @@
+ #include <grub/list.h>
+ #include <grub/misc.h>
+ #include <grub/emu/exec.h>
++#include <grub/emu/getroot.h>
+ #include <sys/types.h>
+ #include <ctype.h>
+ #include <errno.h>
++#include <stdbool.h>
+ #include <stdlib.h>
+ #include <string.h>
+ 
+@@ -336,14 +338,12 @@ get_edd_version (void)
+   return 1;
+ }
+ 
+-static struct efi_variable *
+-make_boot_variable (int num, const char *disk, int part, const char *loader,
+-		    const char *label)
++static ssize_t
++make_efidp (const char *disk, int part, const char *loader, efidp *out)
+ {
+-  struct efi_variable *entry = new_boot_variable ();
+   uint32_t options;
+   uint32_t edd10_devicenum;
+-  ssize_t dp_needed, loadopt_needed;
++  ssize_t dp_needed;
+   efidp dp = NULL;
+ 
+   options = EFIBOOT_ABBREV_HD;
+@@ -374,6 +374,27 @@ make_boot_variable (int num, const char *disk, int part, const char *loader,
+   if (dp_needed < 0)
+     goto err;
+ 
++  *out = dp;
++  return dp_needed;
++
++err:
++  free (dp);
++  *out = NULL;
++  return -1;
++}
++
++static struct efi_variable *
++make_boot_variable (int num, const char *disk, int part, const char *loader,
++		    const char *label)
++{
++  struct efi_variable *entry = new_boot_variable ();
++  ssize_t dp_needed, loadopt_needed;
++  efidp dp = NULL;
++
++  dp_needed = make_efidp (disk, part, loader, &dp);
++  if (dp_needed < 0)
++    goto err;
++
+   loadopt_needed = efi_loadopt_create (NULL, 0, LOAD_OPTION_ACTIVE,
+ 				       dp, dp_needed, (unsigned char *) label,
+ 				       NULL, 0);
+@@ -398,6 +419,71 @@ err:
+   return NULL;
+ }
+ 
++// I hurt my grub today, to see what I can do.
++static efidp *
++get_alternative_esps (void)
++{
++  size_t result_size = 0;
++  efidp *result = NULL;
++  char *alternatives = getenv ("_UBUNTU_ALTERNATIVE_ESPS");
++  char *esp;
++
++  if (!alternatives)
++    goto out;
++
++  for (esp = strtok (alternatives, ", "); esp; esp = strtok (NULL, ", "))
++    {
++      while (isspace (*esp))
++	esp++;
++      if (!*esp)
++	continue;
++
++      char *devname = grub_util_get_grub_dev (esp);
++      if (!devname)
++	continue;
++      grub_device_t dev = grub_device_open (devname);
++      free (devname);
++      if (!dev)
++	continue;
++
++      const char *disk = grub_util_biosdisk_get_osdev (dev->disk);
++      int part = dev->disk->partition ? dev->disk->partition->number + 1 : 1;
++
++      result = xrealloc (result, (++result_size) * sizeof (*result));
++      if (make_efidp (disk, part, "", &result[result_size - 1]) < 0)
++	continue;
++      grub_device_close (dev);
++    }
++
++out:
++  result = xrealloc (result, (++result_size) * sizeof (*result));
++  result[result_size - 1] = NULL;
++  return result;
++}
++
++/* Check if both efidp are on the same device. */
++static bool
++devices_equal (const_efidp a, const_efidp b)
++{
++  while (a && b)
++    {
++      // We reached a file, so we must be on the same device, woohoo
++      if (efidp_subtype (a) == EFIDP_MEDIA_FILE
++	  && efidp_subtype (b) == EFIDP_MEDIA_FILE)
++	return true;
++      if (efidp_node_size (a) != efidp_node_size (b))
++	break;
++      if (memcmp (a, b, efidp_node_size (a)) != 0)
++	break;
++      if (efidp_next_node (a, &a) < 0)
++	break;
++      if (efidp_next_node (b, &b) < 0)
++	break;
++    }
++
++  return false;
++}
++
+ int
+ grub_install_efivar_register_efi (grub_device_t efidir_grub_dev,
+ 				  const char *efifile_path,
+@@ -407,11 +493,20 @@ grub_install_efivar_register_efi (grub_device_t efidir_grub_dev,
+   int efidir_part;
+   struct efi_variable *entries = NULL, *entry;
+   struct efi_variable *order;
++  efidp *alternatives;
++  efidp this;
+   int entry_num = -1;
+   int rc;
+ 
+   efidir_disk = grub_util_biosdisk_get_osdev (efidir_grub_dev->disk);
+   efidir_part = efidir_grub_dev->disk->partition ? efidir_grub_dev->disk->partition->number + 1 : 1;
++  alternatives = get_alternative_esps ();
++
++  if (make_efidp (efidir_disk, efidir_part, "", &this) < 0)
++    {
++      grub_util_warn ("Internal error");
++      return 1;
++    }
+ 
+ #ifdef __linux__
+   /*
+@@ -453,6 +548,8 @@ grub_install_efivar_register_efi (grub_device_t efidir_grub_dev,
+     {
+       efi_load_option *load_option = (efi_load_option *) entry->data;
+       const char *label;
++      efidp path;
++      efidp *alt;
+ 
+       if (entry->num < 0)
+ 	continue;
+@@ -460,6 +557,29 @@ grub_install_efivar_register_efi (grub_device_t efidir_grub_dev,
+       if (strcasecmp (label, efi_distributor) != 0)
+ 	continue;
+ 
++      path = efi_loadopt_path (load_option, entry->data_size);
++      if (!path)
++	continue;
++
++      /* Do not remove this entry if it's an alternative ESP, but do reuse
++       * or remove this entry if it is for the current ESP or any unspecified
++       * ESP */
++      if (!devices_equal (path, this))
++	{
++	  for (alt = alternatives; *alt; alt++)
++	    {
++	      if (devices_equal (path, *alt))
++		break;
++	    }
++
++	  if (*alt)
++	    {
++	      grub_util_info ("not deleting alternative EFI variable %s (%s)",
++			      entry->name, label);
++	      continue;
++	    }
++	}
++
+       /* To avoid problems with some firmware implementations, reuse the first
+          matching variable we find rather than deleting and recreating it.  */
+       if (entry_num == -1)
diff --git a/debian/po/ar.po b/debian/po/ar.po
index e84a6c5..4e88f4f 100644
--- a/debian/po/ar.po
+++ b/debian/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: grub.ar\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2019-07-12 11:37-0400\n"
+"POT-Creation-Date: 2020-04-09 12:18+0200\n"
 "PO-Revision-Date: 2010-07-16 02:38+0300\n"
 "Last-Translator: Ossama M. Khayat <[e-mail]>\n"
 "Language-Team: Arabic <[e-mail]>\n"
@@ -80,6 +80,7 @@ msgstr ""
 #. Type: multiselect
 #. Description
 #: ../grub-pc.templates.in:3001 ../grub-pc.templates.in:4001
+#: ../templates.in:6001
 #, fuzzy
 #| msgid "GRUB failed to install to the following devices:"
 msgid "GRUB install devices:"
@@ -95,7 +96,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:3001
+#: ../grub-pc.templates.in:3001 ../templates.in:5001
 msgid ""
 "Running grub-install automatically is recommended in most situations, to "
 "prevent the installed GRUB core image from getting out of sync with GRUB "
@@ -126,7 +127,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:4001
+#: ../grub-pc.templates.in:4001 ../templates.in:6001
 msgid ""
 "The GRUB boot loader was previously installed to a disk that is no longer "
 "present, or whose unique identifier has changed for some reason. It is "
@@ -155,7 +156,7 @@ msgstr "${DEVICE} (${SIZE} م.ب.، ${MODEL})"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid "Writing GRUB to boot device failed - continue?"
 msgstr ""
 
@@ -164,12 +165,13 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../grub-pc.templates.in:7001 ../grub-pc.templates.in:8001
+#: ../templates.in:8001
 msgid "GRUB failed to install to the following devices:"
 msgstr "تعذر تثبيت GRUB على الأجهزة التالية:"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid ""
 "Do you want to continue anyway? If you do, your computer may not start up "
 "properly."
@@ -199,7 +201,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid "Continue without installing GRUB?"
 msgstr "تريد الاستمرار دون تثبيت GRUB؟"
 
@@ -227,7 +229,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 #, fuzzy
 #| msgid ""
 #| "If you are already running a different boot loader and want to carry on "
@@ -379,15 +381,59 @@ msgid ""
 "server on every boot, this would preserve that behavior."
 msgstr ""
 
-#. Type: string
+#. Type: multiselect
 #. Description
 #: ../templates.in:5001
+msgid "GRUB EFI system partitions:"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../templates.in:5001
+msgid ""
+"The grub-efi package is being upgraded. This menu allows you to select which "
+"EFI system partions you'd like grub-install to be automatically run for, if "
+"any."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../templates.in:7001
+#, fuzzy
+msgid "${DEVICE} (${SIZE} MB; ${PATH}) on ${DISK_SIZE} MB ${DISK_MODEL}"
+msgstr "${DEVICE} (${SIZE} م.ب.، ${MODEL})"
+
+#. Type: boolean
+#. Description
+#: ../templates.in:9001
+#, fuzzy
+#| msgid ""
+#| "You chose not to install GRUB to any devices. If you continue, the boot "
+#| "loader may not be properly configured, and when your computer next starts "
+#| "up it will use whatever was previously in the boot sector. If there is an "
+#| "earlier version of GRUB 2 in the boot sector, it may be unable to load "
+#| "modules or handle the current configuration file."
+msgid ""
+"You chose not to install GRUB to any devices. If you continue, the boot "
+"loader may not be properly configured, and when this computer next starts up "
+"it will use whatever was previously configured. If there is an earlier "
+"version of GRUB 2 in the EFI system partition, it may be unable to load "
+"modules or handle the current configuration file."
+msgstr ""
+"اخترت عدم تثبيت GRUB على أية جهاز. إن استمريت، فقد لا يتم تهيئة محمّل الإقلاع "
+"بشكل صحيح، كما يستخدم حاسبك أي نظام موجود على قطاع الإقلاع مسبقاً. إن كان "
+"هناك نسخة سابقة من GRUB 2 في قطاع الإقلاع، فقد لا يستطيع تحميل الوحدات أو "
+"قراءة ملف التهيئة الحالي بشكل صحيح."
+
+#. Type: string
+#. Description
+#: ../templates.in:10001
 msgid "kFreeBSD command line:"
 msgstr "سطر أوامر KFreeBSD:"
 
 #. Type: string
 #. Description
-#: ../templates.in:5001
+#: ../templates.in:10001
 #, fuzzy
 #| msgid ""
 #| "The following kFreeBSD command line was extracted from /etc/default/grub "
@@ -404,13 +450,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid "kFreeBSD default command line:"
 msgstr "سطر أوامر KFreeBSD الافتراضي:"
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid ""
 "The following string will be used as kFreeBSD parameters for the default "
 "menu entry but not for the recovery mode."
@@ -420,19 +466,19 @@ msgstr ""
 
 #. Type: title
 #. Description
-#: ../templates.in:7001
+#: ../templates.in:12001
 msgid "unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid ""
 "Your system has UEFI Secure Boot enabled in firmware, and the following "
 "kernels present on your system are unsigned:"
@@ -440,13 +486,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid " ${unsigned_versions}"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid ""
 "These kernels cannot be verified under Secure Boot.  To ensure your system "
 "remains bootable, GRUB will not be upgraded on your disk until these kernels "
diff --git a/debian/po/ast.po b/debian/po/ast.po
index 3a9457f..6917c49 100644
--- a/debian/po/ast.po
+++ b/debian/po/ast.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: grub2\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2019-07-12 11:37-0400\n"
+"POT-Creation-Date: 2020-04-09 12:18+0200\n"
 "PO-Revision-Date: 2012-01-27 11:10+0100\n"
 "Last-Translator: Mikel González <[e-mail]>\n"
 "Language-Team: Asturian <[e-mail]>\n"
@@ -71,6 +71,7 @@ msgstr ""
 #. Type: multiselect
 #. Description
 #: ../grub-pc.templates.in:3001 ../grub-pc.templates.in:4001
+#: ../templates.in:6001
 msgid "GRUB install devices:"
 msgstr "GRUB falló al instalar nos siguientes preseos:"
 
@@ -86,7 +87,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:3001
+#: ../grub-pc.templates.in:3001 ../templates.in:5001
 msgid ""
 "Running grub-install automatically is recommended in most situations, to "
 "prevent the installed GRUB core image from getting out of sync with GRUB "
@@ -126,7 +127,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:4001
+#: ../grub-pc.templates.in:4001 ../templates.in:6001
 msgid ""
 "The GRUB boot loader was previously installed to a disk that is no longer "
 "present, or whose unique identifier has changed for some reason. It is "
@@ -157,7 +158,7 @@ msgstr "${DEVICE} (${SIZE} MB; ${PATH})"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid "Writing GRUB to boot device failed - continue?"
 msgstr "Fallu al escribir GRUB al preséu d'arranque - ¿siguir?"
 
@@ -166,12 +167,13 @@ msgstr "Fallu al escribir GRUB al preséu d'arranque - ¿siguir?"
 #. Type: boolean
 #. Description
 #: ../grub-pc.templates.in:7001 ../grub-pc.templates.in:8001
+#: ../templates.in:8001
 msgid "GRUB failed to install to the following devices:"
 msgstr "Falló GRUB al instalar nos siguientes preseos:"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid ""
 "Do you want to continue anyway? If you do, your computer may not start up "
 "properly."
@@ -198,7 +200,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid "Continue without installing GRUB?"
 msgstr "¿Siguir ensin instalar GRUB?"
 
@@ -220,7 +222,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid ""
 "If you are already using a different boot loader and want to carry on doing "
 "so, or if this is a special environment where you do not need a boot loader, "
@@ -366,15 +368,67 @@ msgid ""
 "server on every boot, this would preserve that behavior."
 msgstr ""
 
-#. Type: string
+#. Type: multiselect
+#. Description
+#: ../templates.in:5001
+msgid "GRUB EFI system partitions:"
+msgstr ""
+
+#. Type: multiselect
 #. Description
 #: ../templates.in:5001
+#, fuzzy
+#| msgid ""
+#| "The grub-pc package is being upgraded. This menu allows you to select "
+#| "which devices you'd like grub-install to be automatically run for, if any."
+msgid ""
+"The grub-efi package is being upgraded. This menu allows you to select which "
+"EFI system partions you'd like grub-install to be automatically run for, if "
+"any."
+msgstr ""
+"Anovóse'l paquete grup-pc. Esti menú val pa esbillar en que preseos quie "
+"que'l grub-install s'execute automáticamente, si hai dalgún."
+
+#. Type: text
+#. Description
+#: ../templates.in:7001
+#, fuzzy
+#| msgid "${DEVICE} (${SIZE} MB; ${MODEL})"
+msgid "${DEVICE} (${SIZE} MB; ${PATH}) on ${DISK_SIZE} MB ${DISK_MODEL}"
+msgstr "${DEVICE} (${SIZE} MB; ${MODEL})"
+
+#. Type: boolean
+#. Description
+#: ../templates.in:9001
+#, fuzzy
+#| msgid ""
+#| "You chose not to install GRUB to any devices. If you continue, the boot "
+#| "loader may not be properly configured, and when this computer next starts "
+#| "up it will use whatever was previously in the boot sector. If there is an "
+#| "earlier version of GRUB 2 in the boot sector, it may be unable to load "
+#| "modules or handle the current configuration file."
+msgid ""
+"You chose not to install GRUB to any devices. If you continue, the boot "
+"loader may not be properly configured, and when this computer next starts up "
+"it will use whatever was previously configured. If there is an earlier "
+"version of GRUB 2 in the EFI system partition, it may be unable to load "
+"modules or handle the current configuration file."
+msgstr ""
+"Escoyistes nun instalar GRUB en dengún preséu. De siguir, el xestor "
+"d'arranque podría nun tar configuráu dafechu, y nel siguiente aniciu del "
+"ordenador usarás lo que teníes previamente nel sector d'arranque. Si hai un "
+"versión anterior de GRUB 2 nel sector d'arranque, podría ser capaz de cargar "
+"módulos o remanar el ficheru de configuración actual."
+
+#. Type: string
+#. Description
+#: ../templates.in:10001
 msgid "kFreeBSD command line:"
 msgstr "Linia comandos kFreeBSD:"
 
 #. Type: string
 #. Description
-#: ../templates.in:5001
+#: ../templates.in:10001
 msgid ""
 "The following kFreeBSD command line was extracted from /etc/default/grub or "
 "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is "
@@ -386,13 +440,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid "kFreeBSD default command line:"
 msgstr "Llínia comandos por defeutu kFreeBSD:"
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid ""
 "The following string will be used as kFreeBSD parameters for the default "
 "menu entry but not for the recovery mode."
@@ -402,19 +456,19 @@ msgstr ""
 
 #. Type: title
 #. Description
-#: ../templates.in:7001
+#: ../templates.in:12001
 msgid "unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid ""
 "Your system has UEFI Secure Boot enabled in firmware, and the following "
 "kernels present on your system are unsigned:"
@@ -422,13 +476,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid " ${unsigned_versions}"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid ""
 "These kernels cannot be verified under Secure Boot.  To ensure your system "
 "remains bootable, GRUB will not be upgraded on your disk until these kernels "
diff --git a/debian/po/be.po b/debian/po/be.po
index 26a0984..6d97c20 100644
--- a/debian/po/be.po
+++ b/debian/po/be.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: be\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2019-07-12 11:37-0400\n"
+"POT-Creation-Date: 2020-04-09 12:18+0200\n"
 "PO-Revision-Date: 2017-01-23 11:22+0300\n"
 "Last-Translator: Viktar Siarheichyk <[e-mail]>\n"
 "Language-Team: Debian l10n team for Belarusian <debian-l10n-belarusian@lists."
@@ -77,6 +77,7 @@ msgstr ""
 #. Type: multiselect
 #. Description
 #: ../grub-pc.templates.in:3001 ../grub-pc.templates.in:4001
+#: ../templates.in:6001
 msgid "GRUB install devices:"
 msgstr "Прылады, на якія ўсталёўваць GRUB:"
 
@@ -92,7 +93,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:3001
+#: ../grub-pc.templates.in:3001 ../templates.in:5001
 msgid ""
 "Running grub-install automatically is recommended in most situations, to "
 "prevent the installed GRUB core image from getting out of sync with GRUB "
@@ -132,7 +133,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:4001
+#: ../grub-pc.templates.in:4001 ../templates.in:6001
 msgid ""
 "The GRUB boot loader was previously installed to a disk that is no longer "
 "present, or whose unique identifier has changed for some reason. It is "
@@ -163,7 +164,7 @@ msgstr "- ${DEVICE} (${SIZE} Мб; ${PATH})"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid "Writing GRUB to boot device failed - continue?"
 msgstr "Запіс GRUB на загрузкавую прыладу не ўдаўся - працягваць?"
 
@@ -172,12 +173,13 @@ msgstr "Запіс GRUB на загрузкавую прыладу не ўдаў
 #. Type: boolean
 #. Description
 #: ../grub-pc.templates.in:7001 ../grub-pc.templates.in:8001
+#: ../templates.in:8001
 msgid "GRUB failed to install to the following devices:"
 msgstr "Не атрымалася ўсталяваць GRUB на наступныя прылады:"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid ""
 "Do you want to continue anyway? If you do, your computer may not start up "
 "properly."
@@ -206,7 +208,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid "Continue without installing GRUB?"
 msgstr "Працягваць, не ўсталёўваючы GRUB?"
 
@@ -228,7 +230,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid ""
 "If you are already using a different boot loader and want to carry on doing "
 "so, or if this is a special environment where you do not need a boot loader, "
@@ -398,15 +400,67 @@ msgstr ""
 "зменныя NVRAM настроеныя, каб ваша сістэма кантактавала сервер PXE пры "
 "кожным запуску, гэта захавае такі рэжым."
 
-#. Type: string
+#. Type: multiselect
 #. Description
 #: ../templates.in:5001
+msgid "GRUB EFI system partitions:"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../templates.in:5001
+#, fuzzy
+#| msgid ""
+#| "The grub-pc package is being upgraded. This menu allows you to select "
+#| "which devices you'd like grub-install to be automatically run for, if any."
+msgid ""
+"The grub-efi package is being upgraded. This menu allows you to select which "
+"EFI system partions you'd like grub-install to be automatically run for, if "
+"any."
+msgstr ""
+"x`Пакет grub-pc абнаўляецца. Гэтае меню дазваляе абраць, для якіх прыладаў "
+"трэба, калі ўвогуле трэба, аўтаматычна запускаць grub-install."
+
+#. Type: text
+#. Description
+#: ../templates.in:7001
+#, fuzzy
+#| msgid "${DEVICE} (${SIZE} MB; ${MODEL})"
+msgid "${DEVICE} (${SIZE} MB; ${PATH}) on ${DISK_SIZE} MB ${DISK_MODEL}"
+msgstr "${DEVICE} (${SIZE} MB; ${MODEL})"
+
+#. Type: boolean
+#. Description
+#: ../templates.in:9001
+#, fuzzy
+#| msgid ""
+#| "You chose not to install GRUB to any devices. If you continue, the boot "
+#| "loader may not be properly configured, and when this computer next starts "
+#| "up it will use whatever was previously in the boot sector. If there is an "
+#| "earlier version of GRUB 2 in the boot sector, it may be unable to load "
+#| "modules or handle the current configuration file."
+msgid ""
+"You chose not to install GRUB to any devices. If you continue, the boot "
+"loader may not be properly configured, and when this computer next starts up "
+"it will use whatever was previously configured. If there is an earlier "
+"version of GRUB 2 in the EFI system partition, it may be unable to load "
+"modules or handle the current configuration file."
+msgstr ""
+"Вы выбралі не ўсталёўваць GRUB ні на якую прыладу. Калі Вы працягнеце далей, "
+"пачатковы запускальнік, магчыма, не будзе сканфігураваны належным чынам, і "
+"калі гэты кампутар запусціцца наступным разам, ён загрузіцца з таго, што "
+"было раней у сектары запуску. Калі там была старая версія GRUB 2, ён можа не "
+"здолець загрузіць модулі альбо не разабраць цяперашні канфігурацыйны файл."
+
+#. Type: string
+#. Description
+#: ../templates.in:10001
 msgid "kFreeBSD command line:"
 msgstr "Радок камандаў для ядра kFreeBSD:"
 
 #. Type: string
 #. Description
-#: ../templates.in:5001
+#: ../templates.in:10001
 msgid ""
 "The following kFreeBSD command line was extracted from /etc/default/grub or "
 "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is "
@@ -419,13 +473,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid "kFreeBSD default command line:"
 msgstr "Прадвызначаны радок камандаў для ядра kFreeBSD:"
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid ""
 "The following string will be used as kFreeBSD parameters for the default "
 "menu entry but not for the recovery mode."
@@ -435,19 +489,19 @@ msgstr ""
 
 #. Type: title
 #. Description
-#: ../templates.in:7001
+#: ../templates.in:12001
 msgid "unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid ""
 "Your system has UEFI Secure Boot enabled in firmware, and the following "
 "kernels present on your system are unsigned:"
@@ -455,13 +509,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid " ${unsigned_versions}"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid ""
 "These kernels cannot be verified under Secure Boot.  To ensure your system "
 "remains bootable, GRUB will not be upgraded on your disk until these kernels "
diff --git a/debian/po/bg.po b/debian/po/bg.po
index 05faaa5..6cf0a10 100644
--- a/debian/po/bg.po
+++ b/debian/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: grub2\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2019-07-12 11:37-0400\n"
+"POT-Creation-Date: 2020-04-09 12:18+0200\n"
 "PO-Revision-Date: 2017-01-20 21:19+0200\n"
 "Last-Translator: Damyan Ivanov <[e-mail]>\n"
 "Language-Team: Български <[e-mail]>\n"
@@ -70,6 +70,7 @@ msgstr ""
 #. Type: multiselect
 #. Description
 #: ../grub-pc.templates.in:3001 ../grub-pc.templates.in:4001
+#: ../templates.in:6001
 msgid "GRUB install devices:"
 msgstr "Инсталиране на GRUB на следните устройства:"
 
@@ -85,7 +86,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:3001
+#: ../grub-pc.templates.in:3001 ../templates.in:5001
 msgid ""
 "Running grub-install automatically is recommended in most situations, to "
 "prevent the installed GRUB core image from getting out of sync with GRUB "
@@ -125,7 +126,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:4001
+#: ../grub-pc.templates.in:4001 ../templates.in:6001
 msgid ""
 "The GRUB boot loader was previously installed to a disk that is no longer "
 "present, or whose unique identifier has changed for some reason. It is "
@@ -156,7 +157,7 @@ msgstr "- ${DEVICE} (${SIZE} MB; ${PATH})"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid "Writing GRUB to boot device failed - continue?"
 msgstr ""
 "Записването на GRUB върху устройството за начално зареждане не успя. "
@@ -167,12 +168,13 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../grub-pc.templates.in:7001 ../grub-pc.templates.in:8001
+#: ../templates.in:8001
 msgid "GRUB failed to install to the following devices:"
 msgstr "Опитът за инсталиране на GRUB на следните устройства беше неуспешен:"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid ""
 "Do you want to continue anyway? If you do, your computer may not start up "
 "properly."
@@ -202,7 +204,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid "Continue without installing GRUB?"
 msgstr "Продължаване без инсталиране на GRUB?"
 
@@ -225,7 +227,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid ""
 "If you are already using a different boot loader and want to carry on doing "
 "so, or if this is a special environment where you do not need a boot loader, "
@@ -393,15 +395,68 @@ msgstr ""
 "например връзка с PXE сървър при начално зареждане може да предпочетете да "
 "не се правят промени."
 
-#. Type: string
+#. Type: multiselect
 #. Description
 #: ../templates.in:5001
+msgid "GRUB EFI system partitions:"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../templates.in:5001
+#, fuzzy
+#| msgid ""
+#| "The grub-pc package is being upgraded. This menu allows you to select "
+#| "which devices you'd like grub-install to be automatically run for, if any."
+msgid ""
+"The grub-efi package is being upgraded. This menu allows you to select which "
+"EFI system partions you'd like grub-install to be automatically run for, if "
+"any."
+msgstr ""
+"Пакетът grub-pc се обновява. Това меню позволява избиране за кои устройства "
+"(и дали изобщо) да се изпълни командата grub-install."
+
+#. Type: text
+#. Description
+#: ../templates.in:7001
+#, fuzzy
+#| msgid "${DEVICE} (${SIZE} MB; ${MODEL})"
+msgid "${DEVICE} (${SIZE} MB; ${PATH}) on ${DISK_SIZE} MB ${DISK_MODEL}"
+msgstr "${DEVICE} (${SIZE} MB; ${MODEL})"
+
+#. Type: boolean
+#. Description
+#: ../templates.in:9001
+#, fuzzy
+#| msgid ""
+#| "You chose not to install GRUB to any devices. If you continue, the boot "
+#| "loader may not be properly configured, and when this computer next starts "
+#| "up it will use whatever was previously in the boot sector. If there is an "
+#| "earlier version of GRUB 2 in the boot sector, it may be unable to load "
+#| "modules or handle the current configuration file."
+msgid ""
+"You chose not to install GRUB to any devices. If you continue, the boot "
+"loader may not be properly configured, and when this computer next starts up "
+"it will use whatever was previously configured. If there is an earlier "
+"version of GRUB 2 in the EFI system partition, it may be unable to load "
+"modules or handle the current configuration file."
+msgstr ""
+"Избрано е GRUB да не се инсталира на никакви устройства. Ако продължите, "
+"програмата за начално зареждане може да не е настроена правилно и при "
+"следващото стартиране на компютъра ще се използва предишното съдържание на "
+"сектора за начално зареждане. Ако в него има предишна инсталация на GRUB 2 е "
+"възможно тя да не успее да използва обновените модули или конфигурационния "
+"файл."
+
+#. Type: string
+#. Description
+#: ../templates.in:10001
 msgid "kFreeBSD command line:"
 msgstr "Команден ред за kFreeBSD:"
 
 #. Type: string
 #. Description
-#: ../templates.in:5001
+#: ../templates.in:10001
 msgid ""
 "The following kFreeBSD command line was extracted from /etc/default/grub or "
 "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is "
@@ -413,13 +468,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid "kFreeBSD default command line:"
 msgstr "Параметри на Линукс по подразбиране:"
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid ""
 "The following string will be used as kFreeBSD parameters for the default "
 "menu entry but not for the recovery mode."
@@ -429,19 +484,19 @@ msgstr ""
 
 #. Type: title
 #. Description
-#: ../templates.in:7001
+#: ../templates.in:12001
 msgid "unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid ""
 "Your system has UEFI Secure Boot enabled in firmware, and the following "
 "kernels present on your system are unsigned:"
@@ -449,13 +504,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid " ${unsigned_versions}"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid ""
 "These kernels cannot be verified under Secure Boot.  To ensure your system "
 "remains bootable, GRUB will not be upgraded on your disk until these kernels "
diff --git a/debian/po/ca.po b/debian/po/ca.po
index b23d8ea..a2a0915 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: grub2 2.02~beta3-4\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2019-07-12 11:37-0400\n"
+"POT-Creation-Date: 2020-04-09 12:18+0200\n"
 "PO-Revision-Date: 2017-01-23 17:31+0100\n"
 "Last-Translator: Innocent De Marchi <[e-mail]>\n"
 "Language-Team: Catalan <[e-mail]>\n"
@@ -74,6 +74,7 @@ msgstr ""
 #. Type: multiselect
 #. Description
 #: ../grub-pc.templates.in:3001 ../grub-pc.templates.in:4001
+#: ../templates.in:6001
 msgid "GRUB install devices:"
 msgstr "Dispositius d'instaŀlació del GRUB:"
 
@@ -90,7 +91,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:3001
+#: ../grub-pc.templates.in:3001 ../templates.in:5001
 msgid ""
 "Running grub-install automatically is recommended in most situations, to "
 "prevent the installed GRUB core image from getting out of sync with GRUB "
@@ -131,7 +132,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:4001
+#: ../grub-pc.templates.in:4001 ../templates.in:6001
 msgid ""
 "The GRUB boot loader was previously installed to a disk that is no longer "
 "present, or whose unique identifier has changed for some reason. It is "
@@ -162,7 +163,7 @@ msgstr "- ${DEVICE} (${SIZE} MB; ${PATH})"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid "Writing GRUB to boot device failed - continue?"
 msgstr "Ha fallat l'escriptura del GRUB al dispositiu. Voleu continuar?"
 
@@ -171,12 +172,13 @@ msgstr "Ha fallat l'escriptura del GRUB al dispositiu. Voleu continuar?"
 #. Type: boolean
 #. Description
 #: ../grub-pc.templates.in:7001 ../grub-pc.templates.in:8001
+#: ../templates.in:8001
 msgid "GRUB failed to install to the following devices:"
 msgstr "El GRUB no s'ha pogut instaŀlar als dispositius següents:"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid ""
 "Do you want to continue anyway? If you do, your computer may not start up "
 "properly."
@@ -205,7 +207,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid "Continue without installing GRUB?"
 msgstr "Voleu continuar sense instaŀlar el GRUB?"
 
@@ -228,7 +230,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid ""
 "If you are already using a different boot loader and want to carry on doing "
 "so, or if this is a special environment where you do not need a boot loader, "
@@ -399,15 +401,69 @@ msgstr ""
 "manera que el vostre sistema connecta amb un servidor PXE cada vegada que "
 "arranca, això hauria de conservar aquest comportament."
 
-#. Type: string
+#. Type: multiselect
 #. Description
 #: ../templates.in:5001
+msgid "GRUB EFI system partitions:"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../templates.in:5001
+#, fuzzy
+#| msgid ""
+#| "The grub-pc package is being upgraded. This menu allows you to select "
+#| "which devices you'd like grub-install to be automatically run for, if any."
+msgid ""
+"The grub-efi package is being upgraded. This menu allows you to select which "
+"EFI system partions you'd like grub-install to be automatically run for, if "
+"any."
+msgstr ""
+"S'està actualitzant el paquet grub-pc. Aquest menú us permet seleccionar "
+"sobre quins dispositius voleu que s'execute el grub-install automàticament, "
+"en cas de voler-ho."
+
+#. Type: text
+#. Description
+#: ../templates.in:7001
+#, fuzzy
+#| msgid "${DEVICE} (${SIZE} MB; ${MODEL})"
+msgid "${DEVICE} (${SIZE} MB; ${PATH}) on ${DISK_SIZE} MB ${DISK_MODEL}"
+msgstr "${DEVICE} (${SIZE} MB; ${MODEL})"
+
+#. Type: boolean
+#. Description
+#: ../templates.in:9001
+#, fuzzy
+#| msgid ""
+#| "You chose not to install GRUB to any devices. If you continue, the boot "
+#| "loader may not be properly configured, and when this computer next starts "
+#| "up it will use whatever was previously in the boot sector. If there is an "
+#| "earlier version of GRUB 2 in the boot sector, it may be unable to load "
+#| "modules or handle the current configuration file."
+msgid ""
+"You chose not to install GRUB to any devices. If you continue, the boot "
+"loader may not be properly configured, and when this computer next starts up "
+"it will use whatever was previously configured. If there is an earlier "
+"version of GRUB 2 in the EFI system partition, it may be unable to load "
+"modules or handle the current configuration file."
+msgstr ""
+"Heu triat no instaŀlar el GRUB en cap dispositiu. Si continueu, és possible "
+"que el carregador no estiga configurat correctament, i quan s'arrenque "
+"l'ordinador la pròxima vegada, emprarà allò que estigués al sector "
+"d'arrencada. Si hi ha una versió anterior del GRUB2 al sector d'arrencada, "
+"és possible que no puga carregar mòduls o gestionar el fitxer de "
+"configuració actual."
+
+#. Type: string
+#. Description
+#: ../templates.in:10001
 msgid "kFreeBSD command line:"
 msgstr "Línia d'ordres de kFreeBSD:"
 
 #. Type: string
 #. Description
-#: ../templates.in:5001
+#: ../templates.in:10001
 msgid ""
 "The following kFreeBSD command line was extracted from /etc/default/grub or "
 "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is "
@@ -420,13 +476,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid "kFreeBSD default command line:"
 msgstr "Línia d'ordres de kFreeBSD per defecte:"
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid ""
 "The following string will be used as kFreeBSD parameters for the default "
 "menu entry but not for the recovery mode."
@@ -436,19 +492,19 @@ msgstr ""
 
 #. Type: title
 #. Description
-#: ../templates.in:7001
+#: ../templates.in:12001
 msgid "unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid ""
 "Your system has UEFI Secure Boot enabled in firmware, and the following "
 "kernels present on your system are unsigned:"
@@ -456,13 +512,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid " ${unsigned_versions}"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid ""
 "These kernels cannot be verified under Secure Boot.  To ensure your system "
 "remains bootable, GRUB will not be upgraded on your disk until these kernels "
diff --git a/debian/po/cs.po b/debian/po/cs.po
index f239883..c00a227 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: grub2\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2019-07-12 11:37-0400\n"
+"POT-Creation-Date: 2020-04-09 12:18+0200\n"
 "PO-Revision-Date: 2017-01-22 11:18+0100\n"
 "Last-Translator: Miroslav Kure <[e-mail]>\n"
 "Language-Team: Czech <[e-mail]>\n"
@@ -70,6 +70,7 @@ msgstr ""
 #. Type: multiselect
 #. Description
 #: ../grub-pc.templates.in:3001 ../grub-pc.templates.in:4001
+#: ../templates.in:6001
 msgid "GRUB install devices:"
 msgstr "Zařízení pro instalaci GRUBu:"
 
@@ -85,7 +86,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:3001
+#: ../grub-pc.templates.in:3001 ../templates.in:5001
 msgid ""
 "Running grub-install automatically is recommended in most situations, to "
 "prevent the installed GRUB core image from getting out of sync with GRUB "
@@ -124,7 +125,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:4001
+#: ../grub-pc.templates.in:4001 ../templates.in:6001
 msgid ""
 "The GRUB boot loader was previously installed to a disk that is no longer "
 "present, or whose unique identifier has changed for some reason. It is "
@@ -155,7 +156,7 @@ msgstr "- ${DEVICE} (${SIZE} MB; ${PATH})"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid "Writing GRUB to boot device failed - continue?"
 msgstr "Zápis GRUBu na zaváděcí zařízení selhal - pokračovat?"
 
@@ -164,12 +165,13 @@ msgstr "Zápis GRUBu na zaváděcí zařízení selhal - pokračovat?"
 #. Type: boolean
 #. Description
 #: ../grub-pc.templates.in:7001 ../grub-pc.templates.in:8001
+#: ../templates.in:8001
 msgid "GRUB failed to install to the following devices:"
 msgstr "GRUB se nepodařilo nainstalovat na následující zařízení:"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid ""
 "Do you want to continue anyway? If you do, your computer may not start up "
 "properly."
@@ -197,7 +199,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid "Continue without installing GRUB?"
 msgstr "Pokračovat bez instalace GRUBu?"
 
@@ -219,7 +221,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid ""
 "If you are already using a different boot loader and want to carry on doing "
 "so, or if this is a special environment where you do not need a boot loader, "
@@ -386,15 +388,67 @@ msgstr ""
 "máte NVRAM proměnné nastavené tak, aby při každém zavádění kontaktovaly PXE "
 "server."
 
-#. Type: string
+#. Type: multiselect
 #. Description
 #: ../templates.in:5001
+msgid "GRUB EFI system partitions:"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../templates.in:5001
+#, fuzzy
+#| msgid ""
+#| "The grub-pc package is being upgraded. This menu allows you to select "
+#| "which devices you'd like grub-install to be automatically run for, if any."
+msgid ""
+"The grub-efi package is being upgraded. This menu allows you to select which "
+"EFI system partions you'd like grub-install to be automatically run for, if "
+"any."
+msgstr ""
+"Balík grub-pc se právě aktualizuje. Tato nabídka vám umožňuje zvolit "
+"zařízení, na kterých se má automaticky spouštět grub-install."
+
+#. Type: text
+#. Description
+#: ../templates.in:7001
+#, fuzzy
+#| msgid "${DEVICE} (${SIZE} MB; ${MODEL})"
+msgid "${DEVICE} (${SIZE} MB; ${PATH}) on ${DISK_SIZE} MB ${DISK_MODEL}"
+msgstr "${DEVICE} (${SIZE} MB; ${MODEL})"
+
+#. Type: boolean
+#. Description
+#: ../templates.in:9001
+#, fuzzy
+#| msgid ""
+#| "You chose not to install GRUB to any devices. If you continue, the boot "
+#| "loader may not be properly configured, and when this computer next starts "
+#| "up it will use whatever was previously in the boot sector. If there is an "
+#| "earlier version of GRUB 2 in the boot sector, it may be unable to load "
+#| "modules or handle the current configuration file."
+msgid ""
+"You chose not to install GRUB to any devices. If you continue, the boot "
+"loader may not be properly configured, and when this computer next starts up "
+"it will use whatever was previously configured. If there is an earlier "
+"version of GRUB 2 in the EFI system partition, it may be unable to load "
+"modules or handle the current configuration file."
+msgstr ""
+"Rozhodli jste se neinstalovat GRUB na žádné zařízení. Budete-li pokračovat, "
+"zavaděč nemusí být nastaven správně a při příštím spuštění počítače se "
+"použije cokoliv, co bylo dříve v zaváděcím sektoru. Pokud tam je dřívější "
+"verze GRUBu 2, nemusí se jí podařit načíst moduly, nebo zpracovat současný "
+"konfigurační soubor."
+
+#. Type: string
+#. Description
+#: ../templates.in:10001
 msgid "kFreeBSD command line:"
 msgstr "Parametry pro kFreeBSD:"
 
 #. Type: string
 #. Description
-#: ../templates.in:5001
+#: ../templates.in:10001
 msgid ""
 "The following kFreeBSD command line was extracted from /etc/default/grub or "
 "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is "
@@ -407,13 +461,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid "kFreeBSD default command line:"
 msgstr "Výchozí parametry pro kFreeBSD:"
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid ""
 "The following string will be used as kFreeBSD parameters for the default "
 "menu entry but not for the recovery mode."
@@ -423,19 +477,19 @@ msgstr ""
 
 #. Type: title
 #. Description
-#: ../templates.in:7001
+#: ../templates.in:12001
 msgid "unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid ""
 "Your system has UEFI Secure Boot enabled in firmware, and the following "
 "kernels present on your system are unsigned:"
@@ -443,13 +497,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid " ${unsigned_versions}"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid ""
 "These kernels cannot be verified under Secure Boot.  To ensure your system "
 "remains bootable, GRUB will not be upgraded on your disk until these kernels "
diff --git a/debian/po/cy.po b/debian/po/cy.po
index 70d4326..544639a 100644
--- a/debian/po/cy.po
+++ b/debian/po/cy.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: grub2\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2019-07-12 11:37-0400\n"
+"POT-Creation-Date: 2020-04-09 12:18+0200\n"
 "PO-Revision-Date: 2012-06-16 22:25-0000\n"
 "Last-Translator: Dafydd Tomos <[e-mail]>\n"
 "Language-Team: Welsh\n"
@@ -74,6 +74,7 @@ msgstr ""
 #. Type: multiselect
 #. Description
 #: ../grub-pc.templates.in:3001 ../grub-pc.templates.in:4001
+#: ../templates.in:6001
 msgid "GRUB install devices:"
 msgstr "Dyfeisiau sefydlu GRUB:"
 
@@ -90,7 +91,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:3001
+#: ../grub-pc.templates.in:3001 ../templates.in:5001
 msgid ""
 "Running grub-install automatically is recommended in most situations, to "
 "prevent the installed GRUB core image from getting out of sync with GRUB "
@@ -130,7 +131,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:4001
+#: ../grub-pc.templates.in:4001 ../templates.in:6001
 msgid ""
 "The GRUB boot loader was previously installed to a disk that is no longer "
 "present, or whose unique identifier has changed for some reason. It is "
@@ -161,7 +162,7 @@ msgstr "- ${DEVICE} (${SIZE} MB; ${PATH})"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid "Writing GRUB to boot device failed - continue?"
 msgstr "Methwyd ysgrifennu GRUB i'r ddyfais ymgychwyn - parhau?"
 
@@ -170,12 +171,13 @@ msgstr "Methwyd ysgrifennu GRUB i'r ddyfais ymgychwyn - parhau?"
 #. Type: boolean
 #. Description
 #: ../grub-pc.templates.in:7001 ../grub-pc.templates.in:8001
+#: ../templates.in:8001
 msgid "GRUB failed to install to the following devices:"
 msgstr "Methwyd sefydlu GRUB i'r dyfeisiau canlynol:"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid ""
 "Do you want to continue anyway? If you do, your computer may not start up "
 "properly."
@@ -203,7 +205,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid "Continue without installing GRUB?"
 msgstr "Parhau heb sefydlu GRUB?"
 
@@ -226,7 +228,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid ""
 "If you are already using a different boot loader and want to carry on doing "
 "so, or if this is a special environment where you do not need a boot loader, "
@@ -373,15 +375,69 @@ msgid ""
 "server on every boot, this would preserve that behavior."
 msgstr ""
 
-#. Type: string
+#. Type: multiselect
+#. Description
+#: ../templates.in:5001
+msgid "GRUB EFI system partitions:"
+msgstr ""
+
+#. Type: multiselect
 #. Description
 #: ../templates.in:5001
+#, fuzzy
+#| msgid ""
+#| "The grub-pc package is being upgraded. This menu allows you to select "
+#| "which devices you'd like grub-install to be automatically run for, if any."
+msgid ""
+"The grub-efi package is being upgraded. This menu allows you to select which "
+"EFI system partions you'd like grub-install to be automatically run for, if "
+"any."
+msgstr ""
+"Mae'r pecyn grub-bc yn cael ei uwchraddio. Mae'r fwydlen yma yn eich "
+"caniatáu i ddewis pa ddyfeisiau yr hoffech redeg grub-install arno, os o "
+"gwbl."
+
+#. Type: text
+#. Description
+#: ../templates.in:7001
+#, fuzzy
+#| msgid "${DEVICE} (${SIZE} MB; ${MODEL})"
+msgid "${DEVICE} (${SIZE} MB; ${PATH}) on ${DISK_SIZE} MB ${DISK_MODEL}"
+msgstr "${DEVICE} (${SIZE} MB; ${MODEL})"
+
+#. Type: boolean
+#. Description
+#: ../templates.in:9001
+#, fuzzy
+#| msgid ""
+#| "You chose not to install GRUB to any devices. If you continue, the boot "
+#| "loader may not be properly configured, and when this computer next starts "
+#| "up it will use whatever was previously in the boot sector. If there is an "
+#| "earlier version of GRUB 2 in the boot sector, it may be unable to load "
+#| "modules or handle the current configuration file."
+msgid ""
+"You chose not to install GRUB to any devices. If you continue, the boot "
+"loader may not be properly configured, and when this computer next starts up "
+"it will use whatever was previously configured. If there is an earlier "
+"version of GRUB 2 in the EFI system partition, it may be unable to load "
+"modules or handle the current configuration file."
+msgstr ""
+"Fe ddewisoch i beidio sefydlu GRUB i unrhyw ddyfeisiau. Os ydych yn parhau, "
+"mae'n bosib na fydd y llwythwr ymgychwyn wedi ei gyflunio'n gywir, a'r tro "
+"nesa fydd y cyfrifiadur hwn yn dechrau mi fydd yn defnyddio beth bynnag oedd "
+"yn y sector ymgychwyn o'r blaen. Os oes fersiwn cynharach o GRUB 2 yn y "
+"sector ymgychwyn, mae'n bosib na fydd yn gallu llwytho modiwlau na deall y "
+"ffeil gyfluniad presennol."
+
+#. Type: string
+#. Description
+#: ../templates.in:10001
 msgid "kFreeBSD command line:"
 msgstr "Llinell orchymyn kFreeBSD:"
 
 #. Type: string
 #. Description
-#: ../templates.in:5001
+#: ../templates.in:10001
 msgid ""
 "The following kFreeBSD command line was extracted from /etc/default/grub or "
 "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is "
@@ -393,13 +449,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid "kFreeBSD default command line:"
 msgstr "Llinell orchymyn ddiofyn kFreeBSD:"
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid ""
 "The following string will be used as kFreeBSD parameters for the default "
 "menu entry but not for the recovery mode."
@@ -409,19 +465,19 @@ msgstr ""
 
 #. Type: title
 #. Description
-#: ../templates.in:7001
+#: ../templates.in:12001
 msgid "unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid ""
 "Your system has UEFI Secure Boot enabled in firmware, and the following "
 "kernels present on your system are unsigned:"
@@ -429,13 +485,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid " ${unsigned_versions}"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid ""
 "These kernels cannot be verified under Secure Boot.  To ensure your system "
 "remains bootable, GRUB will not be upgraded on your disk until these kernels "
diff --git a/debian/po/da.po b/debian/po/da.po
index c71327e..ddc3c29 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: grub2\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2019-07-12 11:37-0400\n"
+"POT-Creation-Date: 2020-04-09 12:18+0200\n"
 "PO-Revision-Date: 2017-01-23 11:30+01:00\n"
 "Last-Translator: Joe Hansen <[e-mail]>\n"
 "Language-Team: Danish <[e-mail]>\n"
@@ -83,6 +83,7 @@ msgstr ""
 #. Type: multiselect
 #. Description
 #: ../grub-pc.templates.in:3001 ../grub-pc.templates.in:4001
+#: ../templates.in:6001
 msgid "GRUB install devices:"
 msgstr "GRUBs installationsenheder:"
 
@@ -98,7 +99,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:3001
+#: ../grub-pc.templates.in:3001 ../templates.in:5001
 msgid ""
 "Running grub-install automatically is recommended in most situations, to "
 "prevent the installed GRUB core image from getting out of sync with GRUB "
@@ -138,7 +139,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:4001
+#: ../grub-pc.templates.in:4001 ../templates.in:6001
 msgid ""
 "The GRUB boot loader was previously installed to a disk that is no longer "
 "present, or whose unique identifier has changed for some reason. It is "
@@ -169,7 +170,7 @@ msgstr "- ${DEVICE} (${SIZE} MB; ${PATH})"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid "Writing GRUB to boot device failed - continue?"
 msgstr "Skrivning af GRUB til opstartsenhed fejlede - vil du fortsætte?"
 
@@ -178,12 +179,13 @@ msgstr "Skrivning af GRUB til opstartsenhed fejlede - vil du fortsætte?"
 #. Type: boolean
 #. Description
 #: ../grub-pc.templates.in:7001 ../grub-pc.templates.in:8001
+#: ../templates.in:8001
 msgid "GRUB failed to install to the following devices:"
 msgstr "Kunne ikke installere GRUB på de følgende enheder:"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid ""
 "Do you want to continue anyway? If you do, your computer may not start up "
 "properly."
@@ -211,7 +213,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid "Continue without installing GRUB?"
 msgstr "Fortsæt uden at installere GRUB?"
 
@@ -234,7 +236,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid ""
 "If you are already using a different boot loader and want to carry on doing "
 "so, or if this is a special environment where you do not need a boot loader, "
@@ -404,15 +406,68 @@ msgstr ""
 "variabler er blevet sat sådan op, at dit system kontakter en PXE-server ved "
 "hver opstart, vil dette bevare denne opførsel."
 
-#. Type: string
+#. Type: multiselect
 #. Description
 #: ../templates.in:5001
+msgid "GRUB EFI system partitions:"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../templates.in:5001
+#, fuzzy
+#| msgid ""
+#| "The grub-pc package is being upgraded. This menu allows you to select "
+#| "which devices you'd like grub-install to be automatically run for, if any."
+msgid ""
+"The grub-efi package is being upgraded. This menu allows you to select which "
+"EFI system partions you'd like grub-install to be automatically run for, if "
+"any."
+msgstr ""
+"Pakken grub-pc bliver opgraderet. Denne menu tillader dig at vælge, hvilke "
+"enheder om nogen, du vil have at grub-install automatisk skal køres for."
+
+#. Type: text
+#. Description
+#: ../templates.in:7001
+#, fuzzy
+#| msgid "${DEVICE} (${SIZE} MB; ${MODEL})"
+msgid "${DEVICE} (${SIZE} MB; ${PATH}) on ${DISK_SIZE} MB ${DISK_MODEL}"
+msgstr "${DEVICE} (${SIZE} MB; ${MODEL})"
+
+#. Type: boolean
+#. Description
+#: ../templates.in:9001
+#, fuzzy
+#| msgid ""
+#| "You chose not to install GRUB to any devices. If you continue, the boot "
+#| "loader may not be properly configured, and when this computer next starts "
+#| "up it will use whatever was previously in the boot sector. If there is an "
+#| "earlier version of GRUB 2 in the boot sector, it may be unable to load "
+#| "modules or handle the current configuration file."
+msgid ""
+"You chose not to install GRUB to any devices. If you continue, the boot "
+"loader may not be properly configured, and when this computer next starts up "
+"it will use whatever was previously configured. If there is an earlier "
+"version of GRUB 2 in the EFI system partition, it may be unable to load "
+"modules or handle the current configuration file."
+msgstr ""
+"Du har valgt ikke at installere GRUB på nogen enhed. Hvis du fortsætter, vil "
+"opstarteren (boot loader) måske ikke være korrekt konfigureret, og når din "
+"computer starter op næste gang, vil den bruge det tidligere indhold i din "
+"opstartssektor (boot sector). Hvis der er en tidligere version af GRUB 2 i "
+"opstartsektoren, vil den måske ikke være i stand til at indlæse moduler "
+"eller håndtere den aktuelle konfigurationsfil."
+
+#. Type: string
+#. Description
+#: ../templates.in:10001
 msgid "kFreeBSD command line:"
 msgstr "Kommandolinje for kFreeBSD:"
 
 #. Type: string
 #. Description
-#: ../templates.in:5001
+#: ../templates.in:10001
 msgid ""
 "The following kFreeBSD command line was extracted from /etc/default/grub or "
 "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is "
@@ -424,13 +479,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid "kFreeBSD default command line:"
 msgstr "Standardkommandolinje i kFreeBSD:"
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid ""
 "The following string will be used as kFreeBSD parameters for the default "
 "menu entry but not for the recovery mode."
@@ -440,19 +495,19 @@ msgstr ""
 
 #. Type: title
 #. Description
-#: ../templates.in:7001
+#: ../templates.in:12001
 msgid "unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid ""
 "Your system has UEFI Secure Boot enabled in firmware, and the following "
 "kernels present on your system are unsigned:"
@@ -460,13 +515,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid " ${unsigned_versions}"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid ""
 "These kernels cannot be verified under Secure Boot.  To ensure your system "
 "remains bootable, GRUB will not be upgraded on your disk until these kernels "
diff --git a/debian/po/de.po b/debian/po/de.po
index 14e9406..cd83bb4 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.02~beta3-4\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2019-07-12 11:37-0400\n"
+"POT-Creation-Date: 2020-04-09 12:18+0200\n"
 "PO-Revision-Date: 2019-01-31 18:13+0100\n"
 "Last-Translator: Helge Kreutzmann <[e-mail]>\n"
 "Language-Team: German <[e-mail]>\n"
@@ -73,6 +73,7 @@ msgstr ""
 #. Type: multiselect
 #. Description
 #: ../grub-pc.templates.in:3001 ../grub-pc.templates.in:4001
+#: ../templates.in:6001
 msgid "GRUB install devices:"
 msgstr "Geräte für die GRUB-Installation:"
 
@@ -89,7 +90,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:3001
+#: ../grub-pc.templates.in:3001 ../templates.in:5001
 msgid ""
 "Running grub-install automatically is recommended in most situations, to "
 "prevent the installed GRUB core image from getting out of sync with GRUB "
@@ -129,7 +130,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:4001
+#: ../grub-pc.templates.in:4001 ../templates.in:6001
 msgid ""
 "The GRUB boot loader was previously installed to a disk that is no longer "
 "present, or whose unique identifier has changed for some reason. It is "
@@ -161,7 +162,7 @@ msgstr "- ${DEVICE} (${SIZE} MB; ${PATH})"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid "Writing GRUB to boot device failed - continue?"
 msgstr "GRUB konnte nicht auf das Boot-Gerät geschrieben werden - fortfahren?"
 
@@ -170,12 +171,13 @@ msgstr "GRUB konnte nicht auf das Boot-Gerät geschrieben werden - fortfahren?"
 #. Type: boolean
 #. Description
 #: ../grub-pc.templates.in:7001 ../grub-pc.templates.in:8001
+#: ../templates.in:8001
 msgid "GRUB failed to install to the following devices:"
 msgstr "GRUB konnte nicht auf den folgenden Geräten installiert werden:"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid ""
 "Do you want to continue anyway? If you do, your computer may not start up "
 "properly."
@@ -205,7 +207,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid "Continue without installing GRUB?"
 msgstr "Fortsetzen, ohne Grub zu installieren?"
 
@@ -230,7 +232,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid ""
 "If you are already using a different boot loader and want to carry on doing "
 "so, or if this is a special environment where you do not need a boot loader, "
@@ -405,15 +407,71 @@ msgstr ""
 "einem PXE-Server Kontakt aufnimmt, dann würde dies dieses Verhalten "
 "beibehalten."
 
-#. Type: string
+#. Type: multiselect
 #. Description
 #: ../templates.in:5001
+msgid "GRUB EFI system partitions:"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../templates.in:5001
+#, fuzzy
+#| msgid ""
+#| "The grub-pc package is being upgraded. This menu allows you to select "
+#| "which devices you'd like grub-install to be automatically run for, if any."
+msgid ""
+"The grub-efi package is being upgraded. This menu allows you to select which "
+"EFI system partions you'd like grub-install to be automatically run for, if "
+"any."
+msgstr ""
+"Für das Paket grub-pc wird gerade ein Upgrade durchgeführt. In diesem Menü "
+"können Sie auswählen, ob und für welche Geräte grub-install automatisch "
+"ausgeführt werden soll."
+
+#. Type: text
+#. Description
+#: ../templates.in:7001
+#, fuzzy
+#| msgid "${DEVICE} (${SIZE} MB; ${MODEL})"
+msgid "${DEVICE} (${SIZE} MB; ${PATH}) on ${DISK_SIZE} MB ${DISK_MODEL}"
+msgstr "${DEVICE} (${SIZE} MB; ${MODEL})"
+
+# (mes) Seht Ihr einen Unterschied zwischen der alten und der neuen Version?
+# Ich habe jetzt nur das fuzzy rausgenommen.
+#. Type: boolean
+#. Description
+#: ../templates.in:9001
+#, fuzzy
+#| msgid ""
+#| "You chose not to install GRUB to any devices. If you continue, the boot "
+#| "loader may not be properly configured, and when this computer next starts "
+#| "up it will use whatever was previously in the boot sector. If there is an "
+#| "earlier version of GRUB 2 in the boot sector, it may be unable to load "
+#| "modules or handle the current configuration file."
+msgid ""
+"You chose not to install GRUB to any devices. If you continue, the boot "
+"loader may not be properly configured, and when this computer next starts up "
+"it will use whatever was previously configured. If there is an earlier "
+"version of GRUB 2 in the EFI system partition, it may be unable to load "
+"modules or handle the current configuration file."
+msgstr ""
+"Sie haben sich entschieden, GRUB auf kein Gerät zu installieren. Wenn Sie "
+"fortfahren, könnte der Boot-Loader nicht richtig konfiguriert sein. Beim "
+"nächsten Hochfahren dieses Computers wird der Boot-Loader benutzen, was "
+"immer sich vorher im Boot-Sektor befand. Wenn sich schon eine ältere Version "
+"von GRUB 2 im Boot-Sektor befindet, kann sie möglicherweise keine Module "
+"laden oder nicht mehr mit der aktuellen Konfigurationsdatei umgehen."
+
+#. Type: string
+#. Description
+#: ../templates.in:10001
 msgid "kFreeBSD command line:"
 msgstr "Befehlszeile für kFreeBSD:"
 
 #. Type: string
 #. Description
-#: ../templates.in:5001
+#: ../templates.in:10001
 msgid ""
 "The following kFreeBSD command line was extracted from /etc/default/grub or "
 "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is "
@@ -426,13 +484,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid "kFreeBSD default command line:"
 msgstr "Standard-Befehlszeile für kFreeBSD:"
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid ""
 "The following string will be used as kFreeBSD parameters for the default "
 "menu entry but not for the recovery mode."
@@ -442,19 +500,19 @@ msgstr ""
 
 #. Type: title
 #. Description
-#: ../templates.in:7001
+#: ../templates.in:12001
 msgid "unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid ""
 "Your system has UEFI Secure Boot enabled in firmware, and the following "
 "kernels present on your system are unsigned:"
@@ -462,13 +520,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid " ${unsigned_versions}"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid ""
 "These kernels cannot be verified under Secure Boot.  To ensure your system "
 "remains bootable, GRUB will not be upgraded on your disk until these kernels "
diff --git a/debian/po/dz.po b/debian/po/dz.po
index 2187628..afedbe9 100644
--- a/debian/po/dz.po
+++ b/debian/po/dz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: grub2\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2019-07-12 11:37-0400\n"
+"POT-Creation-Date: 2020-04-09 12:18+0200\n"
 "PO-Revision-Date: 2001-12-31 19:57-0500\n"
 "Last-Translator: Dawa <[e-mail]>\n"
 "Language-Team: Dzongkha <[e-mail]>\n"
@@ -70,6 +70,7 @@ msgstr ""
 #. Type: multiselect
 #. Description
 #: ../grub-pc.templates.in:3001 ../grub-pc.templates.in:4001
+#: ../templates.in:6001
 msgid "GRUB install devices:"
 msgstr "GRUB གཞི་བཙུགས་ ཐབས་འཕྲུལ་ཚུ :"
 
@@ -85,7 +86,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:3001
+#: ../grub-pc.templates.in:3001 ../templates.in:5001
 msgid ""
 "Running grub-install automatically is recommended in most situations, to "
 "prevent the installed GRUB core image from getting out of sync with GRUB "
@@ -123,7 +124,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:4001
+#: ../grub-pc.templates.in:4001 ../templates.in:6001
 msgid ""
 "The GRUB boot loader was previously installed to a disk that is no longer "
 "present, or whose unique identifier has changed for some reason. It is "
@@ -154,7 +155,7 @@ msgstr "- ${DEVICE} (${SIZE} MB; ${PATH})"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid "Writing GRUB to boot device failed - continue?"
 msgstr " GRUB བུཊི་ ཐབས་འཕྲུལ་ལུ་འབྲི་ནི་ འཐུས་ཤོར་འབྱུང་ཡོདཔ - འཕྲོ་མཐུད་དེ་འབད་ནི་ཨིན་ན?"
 
@@ -163,12 +164,13 @@ msgstr " GRUB བུཊི་ ཐབས་འཕྲུལ་ལུ་འབྲ�
 #. Type: boolean
 #. Description
 #: ../grub-pc.templates.in:7001 ../grub-pc.templates.in:8001
+#: ../templates.in:8001
 msgid "GRUB failed to install to the following devices:"
 msgstr "GRUB འདི་ འོག་གི་ཐབས་འཕྲུལ་ཚུ་ནང་གཞི་བཙུགས་འབད་མ་ཚུགས་པས:"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid ""
 "Do you want to continue anyway? If you do, your computer may not start up "
 "properly."
@@ -196,7 +198,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid "Continue without installing GRUB?"
 msgstr "GRUB གཞི་བཙུགས་མ་འབད་བར་འཕྲོ་མཐུད་ནི་ཨིན་ན?"
 
@@ -218,7 +220,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid ""
 "If you are already using a different boot loader and want to carry on doing "
 "so, or if this is a special environment where you do not need a boot loader, "
@@ -360,15 +362,67 @@ msgid ""
 "server on every boot, this would preserve that behavior."
 msgstr ""
 
-#. Type: string
+#. Type: multiselect
+#. Description
+#: ../templates.in:5001
+msgid "GRUB EFI system partitions:"
+msgstr ""
+
+#. Type: multiselect
 #. Description
 #: ../templates.in:5001
+#, fuzzy
+#| msgid ""
+#| "The grub-pc package is being upgraded. This menu allows you to select "
+#| "which devices you'd like grub-install to be automatically run for, if any."
+msgid ""
+"The grub-efi package is being upgraded. This menu allows you to select which "
+"EFI system partions you'd like grub-install to be automatically run for, if "
+"any."
+msgstr ""
+"grub-pc ཐུམ་སྒྲིལ་འདི་ ཡར་བསྐྱེད་འབད་ཡོདཔ། དཀར་ཆག་འདི་གིས་ རང་བཞིན་ གཡོག་བཀོལ་ grub-གཞི་"
+"བཙུགས་ གང་རུང་ཡོད་པ་ཅིན་ ཐབས་འཕྲུལ་ སེལ་འཐུ་འབད་བཅུགཔ་ཨིན།"
+
+#. Type: text
+#. Description
+#: ../templates.in:7001
+#, fuzzy
+#| msgid "${DEVICE} (${SIZE} MB; ${MODEL})"
+msgid "${DEVICE} (${SIZE} MB; ${PATH}) on ${DISK_SIZE} MB ${DISK_MODEL}"
+msgstr "${DEVICE} (${SIZE} MB; ${MODEL})"
+
+#. Type: boolean
+#. Description
+#: ../templates.in:9001
+#, fuzzy
+#| msgid ""
+#| "You chose not to install GRUB to any devices. If you continue, the boot "
+#| "loader may not be properly configured, and when this computer next starts "
+#| "up it will use whatever was previously in the boot sector. If there is an "
+#| "earlier version of GRUB 2 in the boot sector, it may be unable to load "
+#| "modules or handle the current configuration file."
+msgid ""
+"You chose not to install GRUB to any devices. If you continue, the boot "
+"loader may not be properly configured, and when this computer next starts up "
+"it will use whatever was previously configured. If there is an earlier "
+"version of GRUB 2 in the EFI system partition, it may be unable to load "
+"modules or handle the current configuration file."
+msgstr ""
+"ཁྱོད་ཀྱིས་ ཐབས་འཕྲུལ་གང་རུང་ནང་ GRUB གཞི་བཙུགས་མ་འབད་ནི་སྦེ་གདམ་ཁ་བརྐྱབས་ནུག འཕྲོ་མཐུད་དེ་འབད་བ་"
+"ཅིན་ བུཊི་མངོན་གསལ་པ་འདི་ ལེགས་ཤོམ་སྦེ་རིམ་སྒྲིག་མི་འབདཝ་་འོང་། དེ་ལས་ ཁྱོད་ཀྱི་གློག་རིག་འདི་ཤུལ་ལས་"
+"འགོ་བཙུགསཔ་ད་ ཧེ་མ་ལས་བུཊི་ས་ཁོངས་ག་ཅི་ཡོད་རུང་ ལག་ལེན་འཐབ་འོང་། གལ་སྲིད་ བུཊི་ས་ཁོངས་ ནང་ ཧེ་"
+"མའི་ཐོན་རིམ་ GRUB ༢ འདི་ཡོད་པ་ཅིན་ མོ་ཌུལ་འདི་མངོན་གསལའབད་མི་ཚུགས་ནི་ ཡང་ན་ ད་ལྟོའི་རིམ་སྒྲིག་ཡིག་"
+"སྣོད་འདི་ལེགས་སྐྱོང་འཐབ་མི་ཚུགསཔ་འོང་།"
+
+#. Type: string
+#. Description
+#: ../templates.in:10001
 msgid "kFreeBSD command line:"
 msgstr "kFreeBSD བརྡ་བཀོད་གྲལ་ཐིག་:"
 
 #. Type: string
 #. Description
-#: ../templates.in:5001
+#: ../templates.in:10001
 msgid ""
 "The following kFreeBSD command line was extracted from /etc/default/grub or "
 "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is "
@@ -380,13 +434,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid "kFreeBSD default command line:"
 msgstr "kFreeBSD སྔོན་སྒྲིག་བརྡ་བཀོད་གྲལ་ཐིག་:"
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid ""
 "The following string will be used as kFreeBSD parameters for the default "
 "menu entry but not for the recovery mode."
@@ -396,19 +450,19 @@ msgstr ""
 
 #. Type: title
 #. Description
-#: ../templates.in:7001
+#: ../templates.in:12001
 msgid "unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid ""
 "Your system has UEFI Secure Boot enabled in firmware, and the following "
 "kernels present on your system are unsigned:"
@@ -416,13 +470,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid " ${unsigned_versions}"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid ""
 "These kernels cannot be verified under Secure Boot.  To ensure your system "
 "remains bootable, GRUB will not be upgraded on your disk until these kernels "
diff --git a/debian/po/el.po b/debian/po/el.po
index cdff279..15d0d78 100644
--- a/debian/po/el.po
+++ b/debian/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2019-07-12 11:37-0400\n"
+"POT-Creation-Date: 2020-04-09 12:18+0200\n"
 "PO-Revision-Date: 2012-08-17 14:44+0300\n"
 "Last-Translator: pankgeorg<[e-mail]>\n"
 "Language-Team: Greek <[e-mail]>\n"
@@ -75,6 +75,7 @@ msgstr ""
 #. Type: multiselect
 #. Description
 #: ../grub-pc.templates.in:3001 ../grub-pc.templates.in:4001
+#: ../templates.in:6001
 msgid "GRUB install devices:"
 msgstr "Συσκευές εγκατάστασης του GRUB:"
 
@@ -91,7 +92,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:3001
+#: ../grub-pc.templates.in:3001 ../templates.in:5001
 msgid ""
 "Running grub-install automatically is recommended in most situations, to "
 "prevent the installed GRUB core image from getting out of sync with GRUB "
@@ -133,7 +134,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:4001
+#: ../grub-pc.templates.in:4001 ../templates.in:6001
 msgid ""
 "The GRUB boot loader was previously installed to a disk that is no longer "
 "present, or whose unique identifier has changed for some reason. It is "
@@ -165,7 +166,7 @@ msgstr "- ${DEVICE} (${SIZE} MB; ${PATH})"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid "Writing GRUB to boot device failed - continue?"
 msgstr "Η εγκατάσταση του GRUB στην συσκευή εκκίνησης απέτυχε - Συνέχεια;"
 
@@ -174,12 +175,13 @@ msgstr "Η εγκατάσταση του GRUB στην συσκευή εκκίν
 #. Type: boolean
 #. Description
 #: ../grub-pc.templates.in:7001 ../grub-pc.templates.in:8001
+#: ../templates.in:8001
 msgid "GRUB failed to install to the following devices:"
 msgstr "Η εγκατάσταση του GRUB απέτυχε στις ακόλουθες συσκευές:"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid ""
 "Do you want to continue anyway? If you do, your computer may not start up "
 "properly."
@@ -208,7 +210,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid "Continue without installing GRUB?"
 msgstr "Συνέχεια χωρίς εγκατάσταση του GRUB;"
 
@@ -231,7 +233,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid ""
 "If you are already using a different boot loader and want to carry on doing "
 "so, or if this is a special environment where you do not need a boot loader, "
@@ -401,15 +403,69 @@ msgid ""
 "server on every boot, this would preserve that behavior."
 msgstr ""
 
-#. Type: string
+#. Type: multiselect
 #. Description
 #: ../templates.in:5001
+msgid "GRUB EFI system partitions:"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../templates.in:5001
+#, fuzzy
+#| msgid ""
+#| "The grub-pc package is being upgraded. This menu allows you to select "
+#| "which devices you'd like grub-install to be automatically run for, if any."
+msgid ""
+"The grub-efi package is being upgraded. This menu allows you to select which "
+"EFI system partions you'd like grub-install to be automatically run for, if "
+"any."
+msgstr ""
+"Γίνεται αναβάθμιση του πακέτου grub-pc. Αυτό το μενού σας επιτρέπει να "
+"επιλέξετε τις συσκευές, αν θέλετε κάποιες, για τις οποίες θα εκτελεστεί "
+"αυτόματα το grub-install."
+
+#. Type: text
+#. Description
+#: ../templates.in:7001
+#, fuzzy
+#| msgid "${DEVICE} (${SIZE} MB; ${MODEL})"
+msgid "${DEVICE} (${SIZE} MB; ${PATH}) on ${DISK_SIZE} MB ${DISK_MODEL}"
+msgstr "${DEVICE} (${SIZE} MB; ${MODEL})"
+
+#. Type: boolean
+#. Description
+#: ../templates.in:9001
+#, fuzzy
+#| msgid ""
+#| "You chose not to install GRUB to any devices. If you continue, the boot "
+#| "loader may not be properly configured, and when this computer next starts "
+#| "up it will use whatever was previously in the boot sector. If there is an "
+#| "earlier version of GRUB 2 in the boot sector, it may be unable to load "
+#| "modules or handle the current configuration file."
+msgid ""
+"You chose not to install GRUB to any devices. If you continue, the boot "
+"loader may not be properly configured, and when this computer next starts up "
+"it will use whatever was previously configured. If there is an earlier "
+"version of GRUB 2 in the EFI system partition, it may be unable to load "
+"modules or handle the current configuration file."
+msgstr ""
+"Επιλέξατε να μην εγκαταστήσετε το GRUB σε οποιαδήποτε συσκευή. Αν "
+"συνεχίσετε, το πρόγραμμα εκκίνησης πιθανόν να μην έχει ρυθμιστεί σωστά και "
+"στην επανεκκίνηση του υπολογιστή σας θα χρησιμοποιήσει οτιδήποτε υπήρχε από "
+"πριν στον τομέα εκκίνησης. Αν υπάρχει μια προηγούμενη έκδοση του GRUB 2 στον "
+"τομέα εκκίνησης, πιθανόν να μην μπορεί να φορτώσει κάποιες ενότητες αλλά "
+"ούτενα χειριστεί το τρέχον αρχείο ρυθμίσεων."
+
+#. Type: string
+#. Description
+#: ../templates.in:10001
 msgid "kFreeBSD command line:"
 msgstr "Γραμμή εντολών kFreeBSD:"
 
 #. Type: string
 #. Description
-#: ../templates.in:5001
+#: ../templates.in:10001
 msgid ""
 "The following kFreeBSD command line was extracted from /etc/default/grub or "
 "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is "
@@ -422,13 +478,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid "kFreeBSD default command line:"
 msgstr "Προκαθορισμένη γραμμή εντολών kFreeBSD:"
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid ""
 "The following string will be used as kFreeBSD parameters for the default "
 "menu entry but not for the recovery mode."
@@ -439,19 +495,19 @@ msgstr ""
 
 #. Type: title
 #. Description
-#: ../templates.in:7001
+#: ../templates.in:12001
 msgid "unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid ""
 "Your system has UEFI Secure Boot enabled in firmware, and the following "
 "kernels present on your system are unsigned:"
@@ -459,13 +515,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid " ${unsigned_versions}"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid ""
 "These kernels cannot be verified under Secure Boot.  To ensure your system "
 "remains bootable, GRUB will not be upgraded on your disk until these kernels "
diff --git a/debian/po/eo.po b/debian/po/eo.po
index ff04230..5e19611 100644
--- a/debian/po/eo.po
+++ b/debian/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: grub2 2.02-18\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2019-07-12 11:37-0400\n"
+"POT-Creation-Date: 2020-04-09 12:18+0200\n"
 "PO-Revision-Date: 2017-01-23 10:57-0300\n"
 "Last-Translator: Felipe Castro <[e-mail]>\n"
 "Language-Team: Esperanto <[e-mail]>\n"
@@ -72,6 +72,7 @@ msgstr ""
 #. Type: multiselect
 #. Description
 #: ../grub-pc.templates.in:3001 ../grub-pc.templates.in:4001
+#: ../templates.in:6001
 msgid "GRUB install devices:"
 msgstr "Aparatoj instalataj de GRUB:"
 
@@ -87,7 +88,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:3001
+#: ../grub-pc.templates.in:3001 ../templates.in:5001
 msgid ""
 "Running grub-install automatically is recommended in most situations, to "
 "prevent the installed GRUB core image from getting out of sync with GRUB "
@@ -126,7 +127,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:4001
+#: ../grub-pc.templates.in:4001 ../templates.in:6001
 msgid ""
 "The GRUB boot loader was previously installed to a disk that is no longer "
 "present, or whose unique identifier has changed for some reason. It is "
@@ -156,7 +157,7 @@ msgstr "- ${DEVICE} (${SIZE} MB; ${PATH})"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid "Writing GRUB to boot device failed - continue?"
 msgstr "Skribado de GRUB al ekŝarga aparato malsukcesis - ĉu daŭrigi?"
 
@@ -165,12 +166,13 @@ msgstr "Skribado de GRUB al ekŝarga aparato malsukcesis - ĉu daŭrigi?"
 #. Type: boolean
 #. Description
 #: ../grub-pc.templates.in:7001 ../grub-pc.templates.in:8001
+#: ../templates.in:8001
 msgid "GRUB failed to install to the following devices:"
 msgstr "GRUB malsukcesis instali al la jenaj aparatoj:"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid ""
 "Do you want to continue anyway? If you do, your computer may not start up "
 "properly."
@@ -197,7 +199,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid "Continue without installing GRUB?"
 msgstr "Ĉu daŭrigi sen instali GRUB?"
 
@@ -219,7 +221,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid ""
 "If you are already using a different boot loader and want to carry on doing "
 "so, or if this is a special environment where you do not need a boot loader, "
@@ -387,15 +389,67 @@ msgstr ""
 "NVRAM estis agordita por ke via sistemo kontaktu servilon PXE ĉe ĉiu "
 "ekŝargo, ne ŝanĝu ilin por teni la konduton. "
 
-#. Type: string
+#. Type: multiselect
 #. Description
 #: ../templates.in:5001
+msgid "GRUB EFI system partitions:"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../templates.in:5001
+#, fuzzy
+#| msgid ""
+#| "The grub-pc package is being upgraded. This menu allows you to select "
+#| "which devices you'd like grub-install to be automatically run for, if any."
+msgid ""
+"The grub-efi package is being upgraded. This menu allows you to select which "
+"EFI system partions you'd like grub-install to be automatically run for, if "
+"any."
+msgstr ""
+"La pako grub-pc estas ĝisdatigata. Tiu ĉi menuo ebligas al vi elekti iujn "
+"ajn aparatojn por esti aŭtomate instalotaj de grub-install."
+
+#. Type: text
+#. Description
+#: ../templates.in:7001
+#, fuzzy
+#| msgid "${DEVICE} (${SIZE} MB; ${MODEL})"
+msgid "${DEVICE} (${SIZE} MB; ${PATH}) on ${DISK_SIZE} MB ${DISK_MODEL}"
+msgstr "${DEVICE} (${SIZE} MB; ${MODEL})"
+
+#. Type: boolean
+#. Description
+#: ../templates.in:9001
+#, fuzzy
+#| msgid ""
+#| "You chose not to install GRUB to any devices. If you continue, the boot "
+#| "loader may not be properly configured, and when this computer next starts "
+#| "up it will use whatever was previously in the boot sector. If there is an "
+#| "earlier version of GRUB 2 in the boot sector, it may be unable to load "
+#| "modules or handle the current configuration file."
+msgid ""
+"You chose not to install GRUB to any devices. If you continue, the boot "
+"loader may not be properly configured, and when this computer next starts up "
+"it will use whatever was previously configured. If there is an earlier "
+"version of GRUB 2 in the EFI system partition, it may be unable to load "
+"modules or handle the current configuration file."
+msgstr ""
+"Vi elektis ne instali GRUB al iu ajn aparato. Se vi daŭrigas, la ekŝargilo "
+"eble ne estos ĝuste agordita, kaj kiam tiu ĉi komputilo sekve ekŝaltos, ĝi "
+"uzos kion ajn estu antaŭe en la ekŝarga sektoro. Se ekzistas pli frua versio "
+"de GRUB 2 en la ekŝarga sektoro, ĝi eble ne povos ŝargi je moduloj aŭ trakti "
+"la nunan agordo-dosieron."
+
+#. Type: string
+#. Description
+#: ../templates.in:10001
 msgid "kFreeBSD command line:"
 msgstr "Ordon-linio de kFreeBSD:"
 
 #. Type: string
 #. Description
-#: ../templates.in:5001
+#: ../templates.in:10001
 msgid ""
 "The following kFreeBSD command line was extracted from /etc/default/grub or "
 "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is "
@@ -408,13 +462,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid "kFreeBSD default command line:"
 msgstr "Implicita komand-linio de kFreeBSD:"
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid ""
 "The following string will be used as kFreeBSD parameters for the default "
 "menu entry but not for the recovery mode."
@@ -424,19 +478,19 @@ msgstr ""
 
 #. Type: title
 #. Description
-#: ../templates.in:7001
+#: ../templates.in:12001
 msgid "unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid ""
 "Your system has UEFI Secure Boot enabled in firmware, and the following "
 "kernels present on your system are unsigned:"
@@ -444,13 +498,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid " ${unsigned_versions}"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid ""
 "These kernels cannot be verified under Secure Boot.  To ensure your system "
 "remains bootable, GRUB will not be upgraded on your disk until these kernels "
diff --git a/debian/po/es.po b/debian/po/es.po
index c2757ce..3b5bcc7 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -36,7 +36,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: grub2 1.99-5\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2019-07-12 11:37-0400\n"
+"POT-Creation-Date: 2020-04-09 12:18+0200\n"
 "PO-Revision-Date: 2017-01-28 17:07+0100\n"
 "Last-Translator: Manuel \"Venturi\" Porras Peralta <venturi@openmailbox."
 "org>\n"
@@ -104,6 +104,7 @@ msgstr ""
 #. Type: multiselect
 #. Description
 #: ../grub-pc.templates.in:3001 ../grub-pc.templates.in:4001
+#: ../templates.in:6001
 msgid "GRUB install devices:"
 msgstr "Dispositivos donde puede instalar GRUB:"
 
@@ -119,7 +120,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:3001
+#: ../grub-pc.templates.in:3001 ../templates.in:5001
 msgid ""
 "Running grub-install automatically is recommended in most situations, to "
 "prevent the installed GRUB core image from getting out of sync with GRUB "
@@ -159,7 +160,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:4001
+#: ../grub-pc.templates.in:4001 ../templates.in:6001
 msgid ""
 "The GRUB boot loader was previously installed to a disk that is no longer "
 "present, or whose unique identifier has changed for some reason. It is "
@@ -190,7 +191,7 @@ msgstr "- ${DEVICE} (${SIZE} MB; ${PATH})"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid "Writing GRUB to boot device failed - continue?"
 msgstr ""
 "La instalación de GRUB en el dispositivo de inicio ha fallado, ¿desea "
@@ -201,12 +202,13 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../grub-pc.templates.in:7001 ../grub-pc.templates.in:8001
+#: ../templates.in:8001
 msgid "GRUB failed to install to the following devices:"
 msgstr "No se pudo instalar GRUB en los siguientes dispositivos:"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid ""
 "Do you want to continue anyway? If you do, your computer may not start up "
 "properly."
@@ -236,7 +238,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid "Continue without installing GRUB?"
 msgstr "¿Desea continuar sin instalar GRUB?"
 
@@ -259,7 +261,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid ""
 "If you are already using a different boot loader and want to carry on doing "
 "so, or if this is a special environment where you do not need a boot loader, "
@@ -433,15 +435,68 @@ msgstr ""
 "configurado de forma que su sistema contacta con un servidor PXE en cada "
 "arranque, esto conservaría ese comportamiento."
 
-#. Type: string
+#. Type: multiselect
 #. Description
 #: ../templates.in:5001
+msgid "GRUB EFI system partitions:"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../templates.in:5001
+#, fuzzy
+#| msgid ""
+#| "The grub-pc package is being upgraded. This menu allows you to select "
+#| "which devices you'd like grub-install to be automatically run for, if any."
+msgid ""
+"The grub-efi package is being upgraded. This menu allows you to select which "
+"EFI system partions you'd like grub-install to be automatically run for, if "
+"any."
+msgstr ""
+"Se está actualizando el paquete grub-pc. Si lo desea, este menú le permite "
+"escoger en qué dispositivos quiere ejecutar automáticamente grub-install."
+
+#. Type: text
+#. Description
+#: ../templates.in:7001
+#, fuzzy
+#| msgid "${DEVICE} (${SIZE} MB; ${MODEL})"
+msgid "${DEVICE} (${SIZE} MB; ${PATH}) on ${DISK_SIZE} MB ${DISK_MODEL}"
+msgstr "${DEVICE} (${SIZE} MB; ${MODEL})"
+
+#. Type: boolean
+#. Description
+#: ../templates.in:9001
+#, fuzzy
+#| msgid ""
+#| "You chose not to install GRUB to any devices. If you continue, the boot "
+#| "loader may not be properly configured, and when this computer next starts "
+#| "up it will use whatever was previously in the boot sector. If there is an "
+#| "earlier version of GRUB 2 in the boot sector, it may be unable to load "
+#| "modules or handle the current configuration file."
+msgid ""
+"You chose not to install GRUB to any devices. If you continue, the boot "
+"loader may not be properly configured, and when this computer next starts up "
+"it will use whatever was previously configured. If there is an earlier "
+"version of GRUB 2 in the EFI system partition, it may be unable to load "
+"modules or handle the current configuration file."
+msgstr ""
+"Ha escogido no instalar GRUB en ningún dispositivo. Si continúa, puede que "
+"el cargador de inicio no se configure correctamente, y cuando este equipo se "
+"vuelva a iniciar se utilizará lo que hubiera anteriormente en el sector de "
+"inicio. Si hay una versión previa de GRUB 2 en el sector de inicio, puede "
+"que sea imposible cargar los módulos o manejar el fichero de configuración "
+"actual."
+
+#. Type: string
+#. Description
+#: ../templates.in:10001
 msgid "kFreeBSD command line:"
 msgstr "Línea de órdenes de kFreeBSD:"
 
 #. Type: string
 #. Description
-#: ../templates.in:5001
+#: ../templates.in:10001
 msgid ""
 "The following kFreeBSD command line was extracted from /etc/default/grub or "
 "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is "
@@ -454,13 +509,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid "kFreeBSD default command line:"
 msgstr "Línea de órdenes predeterminada de kFreeBSD:"
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid ""
 "The following string will be used as kFreeBSD parameters for the default "
 "menu entry but not for the recovery mode."
@@ -470,19 +525,19 @@ msgstr ""
 
 #. Type: title
 #. Description
-#: ../templates.in:7001
+#: ../templates.in:12001
 msgid "unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid ""
 "Your system has UEFI Secure Boot enabled in firmware, and the following "
 "kernels present on your system are unsigned:"
@@ -490,13 +545,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid " ${unsigned_versions}"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid ""
 "These kernels cannot be verified under Secure Boot.  To ensure your system "
 "remains bootable, GRUB will not be upgraded on your disk until these kernels "
diff --git a/debian/po/eu.po b/debian/po/eu.po
index 01b9f95..04fe4d7 100644
--- a/debian/po/eu.po
+++ b/debian/po/eu.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: grub2_2.02~beta2-18\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2019-07-12 11:37-0400\n"
+"POT-Creation-Date: 2020-04-09 12:18+0200\n"
 "PO-Revision-Date: 2017-01-20 15:48+0100\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <[e-mail]>\n"
 "Language-Team: Basque <[e-mail]>\n"
@@ -74,6 +74,7 @@ msgstr ""
 #. Type: multiselect
 #. Description
 #: ../grub-pc.templates.in:3001 ../grub-pc.templates.in:4001
+#: ../templates.in:6001
 msgid "GRUB install devices:"
 msgstr "GRUB instalatzeko gailuak:"
 
@@ -89,7 +90,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:3001
+#: ../grub-pc.templates.in:3001 ../templates.in:5001
 msgid ""
 "Running grub-install automatically is recommended in most situations, to "
 "prevent the installed GRUB core image from getting out of sync with GRUB "
@@ -129,7 +130,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:4001
+#: ../grub-pc.templates.in:4001 ../templates.in:6001
 msgid ""
 "The GRUB boot loader was previously installed to a disk that is no longer "
 "present, or whose unique identifier has changed for some reason. It is "
@@ -160,7 +161,7 @@ msgstr "- ${DEVICE} (${SIZE} MB; ${PATH})"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid "Writing GRUB to boot device failed - continue?"
 msgstr "Huts egin du GRUB abioko gailuan idaztean - jarraitu?"
 
@@ -169,12 +170,13 @@ msgstr "Huts egin du GRUB abioko gailuan idaztean - jarraitu?"
 #. Type: boolean
 #. Description
 #: ../grub-pc.templates.in:7001 ../grub-pc.templates.in:8001
+#: ../templates.in:8001
 msgid "GRUB failed to install to the following devices:"
 msgstr "GRUBek huts egin du honako gailuetan instalatzean:"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid ""
 "Do you want to continue anyway? If you do, your computer may not start up "
 "properly."
@@ -202,7 +204,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid "Continue without installing GRUB?"
 msgstr "Jarraitu GRUB instalatu gabe?"
 
@@ -224,7 +226,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid ""
 "If you are already using a different boot loader and want to carry on doing "
 "so, or if this is a special environment where you do not need a boot loader, "
@@ -394,15 +396,67 @@ msgstr ""
 "eko aldagaiak konfiguratu egin badira abio bakoitzean sistemak PXE "
 "zerbitzari batekin konektatzeko, honek portaera hori mantenduko luke."
 
-#. Type: string
+#. Type: multiselect
 #. Description
 #: ../templates.in:5001
+msgid "GRUB EFI system partitions:"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../templates.in:5001
+#, fuzzy
+#| msgid ""
+#| "The grub-pc package is being upgraded. This menu allows you to select "
+#| "which devices you'd like grub-install to be automatically run for, if any."
+msgid ""
+"The grub-efi package is being upgraded. This menu allows you to select which "
+"EFI system partions you'd like grub-install to be automatically run for, if "
+"any."
+msgstr ""
+"grub-pc paketea eguneratzen ari da. Menu honek zer gailuentzako automatikoki "
+"grub-install exekutatzea nahi duzun hautatzea (hautatzen baduzu) uzten dizu."
+
+#. Type: text
+#. Description
+#: ../templates.in:7001
+#, fuzzy
+#| msgid "${DEVICE} (${SIZE} MB; ${MODEL})"
+msgid "${DEVICE} (${SIZE} MB; ${PATH}) on ${DISK_SIZE} MB ${DISK_MODEL}"
+msgstr "${DEVICE} (${SIZE} MB; ${MODEL})"
+
+#. Type: boolean
+#. Description
+#: ../templates.in:9001
+#, fuzzy
+#| msgid ""
+#| "You chose not to install GRUB to any devices. If you continue, the boot "
+#| "loader may not be properly configured, and when this computer next starts "
+#| "up it will use whatever was previously in the boot sector. If there is an "
+#| "earlier version of GRUB 2 in the boot sector, it may be unable to load "
+#| "modules or handle the current configuration file."
+msgid ""
+"You chose not to install GRUB to any devices. If you continue, the boot "
+"loader may not be properly configured, and when this computer next starts up "
+"it will use whatever was previously configured. If there is an earlier "
+"version of GRUB 2 in the EFI system partition, it may be unable to load "
+"modules or handle the current configuration file."
+msgstr ""
+"GRUB inolako gailuetan ez instalatzea aukeratu duzu. Jarraitzen baduzu, "
+"baliteke abioko kargatzailea ongi konfiguratuta ez egotea, eta abioko "
+"sektorean aurretik zegoena erabiliko da ordenagailua hurrengo batean "
+"abiatzean. Abioko sektorean GRUB 2ren aurreko bertsio bat egonez gero, agian "
+"ezin izango du moduluak kargatu edo uneko konfigurazioko fitxategia kudeatu."
+
+#. Type: string
+#. Description
+#: ../templates.in:10001
 msgid "kFreeBSD command line:"
 msgstr "KFreeBSD-ko komando-lerroa:"
 
 #. Type: string
 #. Description
-#: ../templates.in:5001
+#: ../templates.in:10001
 msgid ""
 "The following kFreeBSD command line was extracted from /etc/default/grub or "
 "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is "
@@ -414,13 +468,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid "kFreeBSD default command line:"
 msgstr "KFreeBSD-ko komando-lerro lehenetsia:"
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid ""
 "The following string will be used as kFreeBSD parameters for the default "
 "menu entry but not for the recovery mode."
@@ -430,19 +484,19 @@ msgstr ""
 
 #. Type: title
 #. Description
-#: ../templates.in:7001
+#: ../templates.in:12001
 msgid "unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid ""
 "Your system has UEFI Secure Boot enabled in firmware, and the following "
 "kernels present on your system are unsigned:"
@@ -450,13 +504,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid " ${unsigned_versions}"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid ""
 "These kernels cannot be verified under Secure Boot.  To ensure your system "
 "remains bootable, GRUB will not be upgraded on your disk until these kernels "
diff --git a/debian/po/fa.po b/debian/po/fa.po
index d266f06..cdc1b6d 100644
--- a/debian/po/fa.po
+++ b/debian/po/fa.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fa\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2019-07-12 11:37-0400\n"
+"POT-Creation-Date: 2020-04-09 12:18+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Behrad Eslamifar <[e-mail]>\n"
 "Language-Team: debian-l10n-persian <[e-mail]>\n"
@@ -67,6 +67,7 @@ msgstr ""
 #. Type: multiselect
 #. Description
 #: ../grub-pc.templates.in:3001 ../grub-pc.templates.in:4001
+#: ../templates.in:6001
 msgid "GRUB install devices:"
 msgstr "دستگاه‌های نصب گراب:"
 
@@ -83,7 +84,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:3001
+#: ../grub-pc.templates.in:3001 ../templates.in:5001
 msgid ""
 "Running grub-install automatically is recommended in most situations, to "
 "prevent the installed GRUB core image from getting out of sync with GRUB "
@@ -122,7 +123,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:4001
+#: ../grub-pc.templates.in:4001 ../templates.in:6001
 msgid ""
 "The GRUB boot loader was previously installed to a disk that is no longer "
 "present, or whose unique identifier has changed for some reason. It is "
@@ -153,7 +154,7 @@ msgstr "- ${DEVICE} (${SIZE} MB; ${PATH})"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid "Writing GRUB to boot device failed - continue?"
 msgstr "نصب GRUB روی ابزار بوت با شکست مواجه شد - ادامه می‌دهید؟"
 
@@ -162,12 +163,13 @@ msgstr "نصب GRUB روی ابزار بوت با شکست مواجه شد - ا�
 #. Type: boolean
 #. Description
 #: ../grub-pc.templates.in:7001 ../grub-pc.templates.in:8001
+#: ../templates.in:8001
 msgid "GRUB failed to install to the following devices:"
 msgstr "GRUB نتوانست که تجهیزات مورد نظر را نصب کند."
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid ""
 "Do you want to continue anyway? If you do, your computer may not start up "
 "properly."
@@ -195,7 +197,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid "Continue without installing GRUB?"
 msgstr "آیا بدون نصب کردن GRUB ، ادامه می دهید ؟"
 
@@ -217,7 +219,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid ""
 "If you are already using a different boot loader and want to carry on doing "
 "so, or if this is a special environment where you do not need a boot loader, "
@@ -361,15 +363,68 @@ msgid ""
 "server on every boot, this would preserve that behavior."
 msgstr ""
 
-#. Type: string
+#. Type: multiselect
+#. Description
+#: ../templates.in:5001
+msgid "GRUB EFI system partitions:"
+msgstr ""
+
+#. Type: multiselect
 #. Description
 #: ../templates.in:5001
+#, fuzzy
+#| msgid ""
+#| "The grub-pc package is being upgraded. This menu allows you to select "
+#| "which devices you'd like grub-install to be automatically run for, if any."
+msgid ""
+"The grub-efi package is being upgraded. This menu allows you to select which "
+"EFI system partions you'd like grub-install to be automatically run for, if "
+"any."
+msgstr ""
+"بستهٔ grub-pc در حال ارتقاء است. این منو به شما اجازه می‌دهد که هر یک از "
+"دستگاه‌ها را، در صورت وجود، که مایلید grub-install به صورت خودکار برایش اجرا "
+"گردد را انتخاب کنید."
+
+#. Type: text
+#. Description
+#: ../templates.in:7001
+#, fuzzy
+#| msgid "${DEVICE} (${SIZE} MB; ${MODEL})"
+msgid "${DEVICE} (${SIZE} MB; ${PATH}) on ${DISK_SIZE} MB ${DISK_MODEL}"
+msgstr "${DEVICE} (${SIZE} MB; ${MODEL})"
+
+#. Type: boolean
+#. Description
+#: ../templates.in:9001
+#, fuzzy
+#| msgid ""
+#| "You chose not to install GRUB to any devices. If you continue, the boot "
+#| "loader may not be properly configured, and when this computer next starts "
+#| "up it will use whatever was previously in the boot sector. If there is an "
+#| "earlier version of GRUB 2 in the boot sector, it may be unable to load "
+#| "modules or handle the current configuration file."
+msgid ""
+"You chose not to install GRUB to any devices. If you continue, the boot "
+"loader may not be properly configured, and when this computer next starts up "
+"it will use whatever was previously configured. If there is an earlier "
+"version of GRUB 2 in the EFI system partition, it may be unable to load "
+"modules or handle the current configuration file."
+msgstr ""
+"شما نصب GRUB را برای هیچ ابزاری انتخاب نکرده‌اید. اگر ادامه دهید، ممکن است که "
+"راه‌انداز به درستی تنظیم نشده باشد، و هنگام بالا آمدن بعدی این کامپیوتر، از "
+"آن چه که قبلاً بر روی بوت سکتور بوده است استفاده می‌کند. اگر نسخهٔ قدیمی‌تری از "
+"گراب۲ بر روی بوت سکتور وجود دارد، ممکن است که قادر نباشد ماژول‌ها را بارگذاری "
+"کند و یا پیکربندی کنونی فایل را به کار بندد."
+
+#. Type: string
+#. Description
+#: ../templates.in:10001
 msgid "kFreeBSD command line:"
 msgstr "خط فرمان kFreeBSD:"
 
 #. Type: string
 #. Description
-#: ../templates.in:5001
+#: ../templates.in:10001
 msgid ""
 "The following kFreeBSD command line was extracted from /etc/default/grub or "
 "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is "
@@ -381,13 +436,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid "kFreeBSD default command line:"
 msgstr "خط فرمان پیش فرض kFreeBSD:"
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid ""
 "The following string will be used as kFreeBSD parameters for the default "
 "menu entry but not for the recovery mode."
@@ -397,19 +452,19 @@ msgstr ""
 
 #. Type: title
 #. Description
-#: ../templates.in:7001
+#: ../templates.in:12001
 msgid "unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid ""
 "Your system has UEFI Secure Boot enabled in firmware, and the following "
 "kernels present on your system are unsigned:"
@@ -417,13 +472,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid " ${unsigned_versions}"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid ""
 "These kernels cannot be verified under Secure Boot.  To ensure your system "
 "remains bootable, GRUB will not be upgraded on your disk until these kernels "
diff --git a/debian/po/fi.po b/debian/po/fi.po
index 89b59fe..2480507 100644
--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: grub2\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2019-07-12 11:37-0400\n"
+"POT-Creation-Date: 2020-04-09 12:18+0200\n"
 "PO-Revision-Date: 2014-12-27 18:53+0200\n"
 "Last-Translator: Timo Jyrinki <[e-mail]>\n"
 "Language-Team: Finnish <[e-mail]>\n"
@@ -71,6 +71,7 @@ msgstr ""
 #. Type: multiselect
 #. Description
 #: ../grub-pc.templates.in:3001 ../grub-pc.templates.in:4001
+#: ../templates.in:6001
 msgid "GRUB install devices:"
 msgstr "Laitteet joille GRUB asennetaan:"
 
@@ -86,7 +87,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:3001
+#: ../grub-pc.templates.in:3001 ../templates.in:5001
 msgid ""
 "Running grub-install automatically is recommended in most situations, to "
 "prevent the installed GRUB core image from getting out of sync with GRUB "
@@ -126,7 +127,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:4001
+#: ../grub-pc.templates.in:4001 ../templates.in:6001
 msgid ""
 "The GRUB boot loader was previously installed to a disk that is no longer "
 "present, or whose unique identifier has changed for some reason. It is "
@@ -157,7 +158,7 @@ msgstr "- ${DEVICE} (${SIZE} MB; ${PATH})"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid "Writing GRUB to boot device failed - continue?"
 msgstr "GRUBin kirjoittaminen käynnistyslaitteelle epäonnistui. Jatketaanko?"
 
@@ -166,12 +167,13 @@ msgstr "GRUBin kirjoittaminen käynnistyslaitteelle epäonnistui. Jatketaanko?"
 #. Type: boolean
 #. Description
 #: ../grub-pc.templates.in:7001 ../grub-pc.templates.in:8001
+#: ../templates.in:8001
 msgid "GRUB failed to install to the following devices:"
 msgstr "GRUBia ei voitu asentaa seuraaville laitteille:"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid ""
 "Do you want to continue anyway? If you do, your computer may not start up "
 "properly."
@@ -201,7 +203,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid "Continue without installing GRUB?"
 msgstr "Jatketaanko asentamatta GRUBia?"
 
@@ -223,7 +225,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid ""
 "If you are already using a different boot loader and want to carry on doing "
 "so, or if this is a special environment where you do not need a boot loader, "
@@ -388,15 +390,67 @@ msgid ""
 "server on every boot, this would preserve that behavior."
 msgstr ""
 
-#. Type: string
+#. Type: multiselect
 #. Description
 #: ../templates.in:5001
+msgid "GRUB EFI system partitions:"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../templates.in:5001
+#, fuzzy
+#| msgid ""
+#| "The grub-pc package is being upgraded. This menu allows you to select "
+#| "which devices you'd like grub-install to be automatically run for, if any."
+msgid ""
+"The grub-efi package is being upgraded. This menu allows you to select which "
+"EFI system partions you'd like grub-install to be automatically run for, if "
+"any."
+msgstr ""
+"grub-pc-pakettia päivitetään. Tästä valikosta voit valita, mille laitteille "
+"grub-install suoritetaan automaattisesti."
+
+#. Type: text
+#. Description
+#: ../templates.in:7001
+#, fuzzy
+#| msgid "${DEVICE} (${SIZE} MB; ${MODEL})"
+msgid "${DEVICE} (${SIZE} MB; ${PATH}) on ${DISK_SIZE} MB ${DISK_MODEL}"
+msgstr "${DEVICE} (${SIZE} MB; ${MODEL})"
+
+#. Type: boolean
+#. Description
+#: ../templates.in:9001
+#, fuzzy
+#| msgid ""
+#| "You chose not to install GRUB to any devices. If you continue, the boot "
+#| "loader may not be properly configured, and when this computer next starts "
+#| "up it will use whatever was previously in the boot sector. If there is an "
+#| "earlier version of GRUB 2 in the boot sector, it may be unable to load "
+#| "modules or handle the current configuration file."
+msgid ""
+"You chose not to install GRUB to any devices. If you continue, the boot "
+"loader may not be properly configured, and when this computer next starts up "
+"it will use whatever was previously configured. If there is an earlier "
+"version of GRUB 2 in the EFI system partition, it may be unable to load "
+"modules or handle the current configuration file."
+msgstr ""
+"Päätit olla asentamatta GRUBia millekään laitteelle. Jos jatkat, "
+"alkulatausohjelman asetukset saattavat olla väärät ja kun kone käynnistetään "
+"uudelleen seuraavan kerran, se käyttää käynnistyslohkon aiempia asetuksia. "
+"Jos käynnistyslohkossa on GRUB 2:n aiempi versio, se ei välttämättä pysty "
+"lataamaan moduuleja tai käsittelemään nykyistä asetustiedostoa."
+
+#. Type: string
+#. Description
+#: ../templates.in:10001
 msgid "kFreeBSD command line:"
 msgstr "kFreeBSD:n komentorivi:"
 
 #. Type: string
 #. Description
-#: ../templates.in:5001
+#: ../templates.in:10001
 msgid ""
 "The following kFreeBSD command line was extracted from /etc/default/grub or "
 "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is "
@@ -409,13 +463,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid "kFreeBSD default command line:"
 msgstr "kFreeBSD:n oletuskomentorivi:"
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid ""
 "The following string will be used as kFreeBSD parameters for the default "
 "menu entry but not for the recovery mode."
@@ -425,19 +479,19 @@ msgstr ""
 
 #. Type: title
 #. Description
-#: ../templates.in:7001
+#: ../templates.in:12001
 msgid "unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid ""
 "Your system has UEFI Secure Boot enabled in firmware, and the following "
 "kernels present on your system are unsigned:"
@@ -445,13 +499,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid " ${unsigned_versions}"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid ""
 "These kernels cannot be verified under Secure Boot.  To ensure your system "
 "remains bootable, GRUB will not be upgraded on your disk until these kernels "
diff --git a/debian/po/fr.po b/debian/po/fr.po
index a812ed6..752ca87 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2019-07-12 11:37-0400\n"
+"POT-Creation-Date: 2020-04-09 12:18+0200\n"
 "PO-Revision-Date: 2017-01-22 15:53+0100\n"
 "Last-Translator: Baptiste Jammet <[e-mail]>\n"
 "Language-Team: French <[e-mail]>\n"
@@ -74,6 +74,7 @@ msgstr ""
 #. Type: multiselect
 #. Description
 #: ../grub-pc.templates.in:3001 ../grub-pc.templates.in:4001
+#: ../templates.in:6001
 msgid "GRUB install devices:"
 msgstr "Périphériques où installer GRUB :"
 
@@ -90,7 +91,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:3001
+#: ../grub-pc.templates.in:3001 ../templates.in:5001
 msgid ""
 "Running grub-install automatically is recommended in most situations, to "
 "prevent the installed GRUB core image from getting out of sync with GRUB "
@@ -132,7 +133,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:4001
+#: ../grub-pc.templates.in:4001 ../templates.in:6001
 msgid ""
 "The GRUB boot loader was previously installed to a disk that is no longer "
 "present, or whose unique identifier has changed for some reason. It is "
@@ -164,7 +165,7 @@ msgstr "- ${DEVICE} (${SIZE} Mo; ${PATH})"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid "Writing GRUB to boot device failed - continue?"
 msgstr ""
 "Échec de l'installation de GRUB sur le périphérique d'amorçage. Continuer ?"
@@ -174,12 +175,13 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../grub-pc.templates.in:7001 ../grub-pc.templates.in:8001
+#: ../templates.in:8001
 msgid "GRUB failed to install to the following devices:"
 msgstr "GRUB n'a pas pu être installé sur les périphériques suivants :"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid ""
 "Do you want to continue anyway? If you do, your computer may not start up "
 "properly."
@@ -209,7 +211,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid "Continue without installing GRUB?"
 msgstr "Faut-il poursuivre sans installer GRUB ?"
 
@@ -232,7 +234,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid ""
 "If you are already using a different boot loader and want to carry on doing "
 "so, or if this is a special environment where you do not need a boot loader, "
@@ -411,15 +413,69 @@ msgstr ""
 "ont été configurées pour que le système se connecte à un serveur PXE à "
 "chaque démarrage, cela conserverait ce comportement."
 
-#. Type: string
+#. Type: multiselect
 #. Description
 #: ../templates.in:5001
+msgid "GRUB EFI system partitions:"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../templates.in:5001
+#, fuzzy
+#| msgid ""
+#| "The grub-pc package is being upgraded. This menu allows you to select "
+#| "which devices you'd like grub-install to be automatically run for, if any."
+msgid ""
+"The grub-efi package is being upgraded. This menu allows you to select which "
+"EFI system partions you'd like grub-install to be automatically run for, if "
+"any."
+msgstr ""
+"Le paquet grub-pc est en cours de mise à jour. Ce menu permet de choisir "
+"pour quels périphériques vous souhaitez exécuter la commande grub-install "
+"automatiquement."
+
+#. Type: text
+#. Description
+#: ../templates.in:7001
+#, fuzzy
+#| msgid "${DEVICE} (${SIZE} MB; ${MODEL})"
+msgid "${DEVICE} (${SIZE} MB; ${PATH}) on ${DISK_SIZE} MB ${DISK_MODEL}"
+msgstr "${DEVICE} (${SIZE} Mo; ${MODEL})"
+
+#. Type: boolean
+#. Description
+#: ../templates.in:9001
+#, fuzzy
+#| msgid ""
+#| "You chose not to install GRUB to any devices. If you continue, the boot "
+#| "loader may not be properly configured, and when this computer next starts "
+#| "up it will use whatever was previously in the boot sector. If there is an "
+#| "earlier version of GRUB 2 in the boot sector, it may be unable to load "
+#| "modules or handle the current configuration file."
+msgid ""
+"You chose not to install GRUB to any devices. If you continue, the boot "
+"loader may not be properly configured, and when this computer next starts up "
+"it will use whatever was previously configured. If there is an earlier "
+"version of GRUB 2 in the EFI system partition, it may be unable to load "
+"modules or handle the current configuration file."
+msgstr ""
+"Vous avez choisi de n'installer GRUB sur aucun périphérique. Si vous "
+"poursuivez, il est possible que le programme de démarrage ne soit pas "
+"configuré correctement et que la machine démarre avec ce qui était "
+"précédemment installé sur le secteur d'amorçage. Si une ancienne version de "
+"GRUB 2 s'y trouve, il est possible qu'elle ne puisse pas charger certains "
+"modules ou lire le fichier de configuration actuel."
+
+#. Type: string
+#. Description
+#: ../templates.in:10001
 msgid "kFreeBSD command line:"
 msgstr "Ligne de commande de kFreeBSD :"
 
 #. Type: string
 #. Description
-#: ../templates.in:5001
+#: ../templates.in:10001
 msgid ""
 "The following kFreeBSD command line was extracted from /etc/default/grub or "
 "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is "
@@ -432,13 +488,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid "kFreeBSD default command line:"
 msgstr "Ligne de commande par défaut de kFreeBSD :"
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid ""
 "The following string will be used as kFreeBSD parameters for the default "
 "menu entry but not for the recovery mode."
@@ -448,19 +504,19 @@ msgstr ""
 
 #. Type: title
 #. Description
-#: ../templates.in:7001
+#: ../templates.in:12001
 msgid "unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid ""
 "Your system has UEFI Secure Boot enabled in firmware, and the following "
 "kernels present on your system are unsigned:"
@@ -468,13 +524,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid " ${unsigned_versions}"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid ""
 "These kernels cannot be verified under Secure Boot.  To ensure your system "
 "remains bootable, GRUB will not be upgraded on your disk until these kernels "
diff --git a/debian/po/gl.po b/debian/po/gl.po
index 550256e..dd75890 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: grub2_1.98+20100804-2_gl\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2019-07-12 11:37-0400\n"
+"POT-Creation-Date: 2020-04-09 12:18+0200\n"
 "PO-Revision-Date: 2012-06-13 16:13+0200\n"
 "Last-Translator: Jorge Barreiro <[e-mail]>\n"
 "Language-Team: Galician <[e-mail]>\n"
@@ -74,6 +74,7 @@ msgstr ""
 #. Type: multiselect
 #. Description
 #: ../grub-pc.templates.in:3001 ../grub-pc.templates.in:4001
+#: ../templates.in:6001
 msgid "GRUB install devices:"
 msgstr "Dispositivos onde instalar GRUB:"
 
@@ -90,7 +91,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:3001
+#: ../grub-pc.templates.in:3001 ../templates.in:5001
 msgid ""
 "Running grub-install automatically is recommended in most situations, to "
 "prevent the installed GRUB core image from getting out of sync with GRUB "
@@ -130,7 +131,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:4001
+#: ../grub-pc.templates.in:4001 ../templates.in:6001
 msgid ""
 "The GRUB boot loader was previously installed to a disk that is no longer "
 "present, or whose unique identifier has changed for some reason. It is "
@@ -161,7 +162,7 @@ msgstr "- ${DEVICE} (${SIZE} MB; ${PATH})"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid "Writing GRUB to boot device failed - continue?"
 msgstr ""
 "Produciuse un erro ao escribir GRUB no dispositivo de arranque. Quere "
@@ -172,12 +173,13 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../grub-pc.templates.in:7001 ../grub-pc.templates.in:8001
+#: ../templates.in:8001
 msgid "GRUB failed to install to the following devices:"
 msgstr "Non se puido instalar GRUB nos seguintes dispositivos:"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid ""
 "Do you want to continue anyway? If you do, your computer may not start up "
 "properly."
@@ -207,7 +209,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid "Continue without installing GRUB?"
 msgstr "Quere continuar sen instalar GRUB?"
 
@@ -229,7 +231,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid ""
 "If you are already using a different boot loader and want to carry on doing "
 "so, or if this is a special environment where you do not need a boot loader, "
@@ -376,15 +378,68 @@ msgid ""
 "server on every boot, this would preserve that behavior."
 msgstr ""
 
-#. Type: string
+#. Type: multiselect
+#. Description
+#: ../templates.in:5001
+msgid "GRUB EFI system partitions:"
+msgstr ""
+
+#. Type: multiselect
 #. Description
 #: ../templates.in:5001
+#, fuzzy
+#| msgid ""
+#| "The grub-pc package is being upgraded. This menu allows you to select "
+#| "which devices you'd like grub-install to be automatically run for, if any."
+msgid ""
+"The grub-efi package is being upgraded. This menu allows you to select which "
+"EFI system partions you'd like grub-install to be automatically run for, if "
+"any."
+msgstr ""
+"O paquete «grub-pc» estase actualizando. Este menú permítelle escoller os "
+"dispositivos onde queira que se execute «grub-install» automaticamente, se "
+"quere facelo en algún."
+
+#. Type: text
+#. Description
+#: ../templates.in:7001
+#, fuzzy
+#| msgid "${DEVICE} (${SIZE} MB; ${MODEL})"
+msgid "${DEVICE} (${SIZE} MB; ${PATH}) on ${DISK_SIZE} MB ${DISK_MODEL}"
+msgstr "${DEVICE} (${SIZE} MB; ${MODEL})"
+
+#. Type: boolean
+#. Description
+#: ../templates.in:9001
+#, fuzzy
+#| msgid ""
+#| "You chose not to install GRUB to any devices. If you continue, the boot "
+#| "loader may not be properly configured, and when this computer next starts "
+#| "up it will use whatever was previously in the boot sector. If there is an "
+#| "earlier version of GRUB 2 in the boot sector, it may be unable to load "
+#| "modules or handle the current configuration file."
+msgid ""
+"You chose not to install GRUB to any devices. If you continue, the boot "
+"loader may not be properly configured, and when this computer next starts up "
+"it will use whatever was previously configured. If there is an earlier "
+"version of GRUB 2 in the EFI system partition, it may be unable to load "
+"modules or handle the current configuration file."
+msgstr ""
+"Escolleu non instalar GRUB en ningún dispositivo. De continuar,pode que o "
+"cargador de arranque non quede adecuadamente configurado, e a próxima vez "
+"que arranque o sistema usarase o que houbese antes no sector de arranque. Se "
+"nel hai unha versión antiga de GRUB 2 pode que esta sexa incapaz de cargar "
+"os módulos ou de manexar o ficheiro de configuración actual."
+
+#. Type: string
+#. Description
+#: ../templates.in:10001
 msgid "kFreeBSD command line:"
 msgstr "Liña de comando de kFreeBSD:"
 
 #. Type: string
 #. Description
-#: ../templates.in:5001
+#: ../templates.in:10001
 msgid ""
 "The following kFreeBSD command line was extracted from /etc/default/grub or "
 "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is "
@@ -397,13 +452,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid "kFreeBSD default command line:"
 msgstr "Liña de comando por defecto para kFreeBSD:"
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid ""
 "The following string will be used as kFreeBSD parameters for the default "
 "menu entry but not for the recovery mode."
@@ -413,19 +468,19 @@ msgstr ""
 
 #. Type: title
 #. Description
-#: ../templates.in:7001
+#: ../templates.in:12001
 msgid "unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid ""
 "Your system has UEFI Secure Boot enabled in firmware, and the following "
 "kernels present on your system are unsigned:"
@@ -433,13 +488,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid " ${unsigned_versions}"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid ""
 "These kernels cannot be verified under Secure Boot.  To ensure your system "
 "remains bootable, GRUB will not be upgraded on your disk until these kernels "
diff --git a/debian/po/gu.po b/debian/po/gu.po
index d122374..036e84b 100644
--- a/debian/po/gu.po
+++ b/debian/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: grub-gu\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2019-07-12 11:37-0400\n"
+"POT-Creation-Date: 2020-04-09 12:18+0200\n"
 "PO-Revision-Date: 2012-03-04 09:56+0530\n"
 "Last-Translator: Kartik Mistry <[e-mail]>\n"
 "Language-Team: Gujarati <[e-mail]>\n"
@@ -67,6 +67,7 @@ msgstr ""
 #. Type: multiselect
 #. Description
 #: ../grub-pc.templates.in:3001 ../grub-pc.templates.in:4001
+#: ../templates.in:6001
 msgid "GRUB install devices:"
 msgstr "GRUB સ્થાપન ઉપકરણો:"
 
@@ -82,7 +83,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:3001
+#: ../grub-pc.templates.in:3001 ../templates.in:5001
 msgid ""
 "Running grub-install automatically is recommended in most situations, to "
 "prevent the installed GRUB core image from getting out of sync with GRUB "
@@ -120,7 +121,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:4001
+#: ../grub-pc.templates.in:4001 ../templates.in:6001
 msgid ""
 "The GRUB boot loader was previously installed to a disk that is no longer "
 "present, or whose unique identifier has changed for some reason. It is "
@@ -150,7 +151,7 @@ msgstr "- ${DEVICE} (${SIZE} એમબી; ${PATH})"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid "Writing GRUB to boot device failed - continue?"
 msgstr "GRUB ને બૂટ ઉપકરણમાં લખવાનું નિષ્ફળ ગયું - ચાલુ રાખશો?"
 
@@ -159,12 +160,13 @@ msgstr "GRUB ને બૂટ ઉપકરણમાં લખવાનું ન
 #. Type: boolean
 #. Description
 #: ../grub-pc.templates.in:7001 ../grub-pc.templates.in:8001
+#: ../templates.in:8001
 msgid "GRUB failed to install to the following devices:"
 msgstr "GRUB નીચેના ઉપકરણોમાં સ્થાપિત થવામાં નિષ્ફળ ગયું:"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid ""
 "Do you want to continue anyway? If you do, your computer may not start up "
 "properly."
@@ -191,7 +193,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid "Continue without installing GRUB?"
 msgstr "GRUB સ્થાપન કર્યા વગર આગળ વધશો?"
 
@@ -212,7 +214,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid ""
 "If you are already using a different boot loader and want to carry on doing "
 "so, or if this is a special environment where you do not need a boot loader, "
@@ -353,15 +355,66 @@ msgid ""
 "server on every boot, this would preserve that behavior."
 msgstr ""
 
-#. Type: string
+#. Type: multiselect
+#. Description
+#: ../templates.in:5001
+msgid "GRUB EFI system partitions:"
+msgstr ""
+
+#. Type: multiselect
 #. Description
 #: ../templates.in:5001
+#, fuzzy
+#| msgid ""
+#| "The grub-pc package is being upgraded. This menu allows you to select "
+#| "which devices you'd like grub-install to be automatically run for, if any."
+msgid ""
+"The grub-efi package is being upgraded. This menu allows you to select which "
+"EFI system partions you'd like grub-install to be automatically run for, if "
+"any."
+msgstr ""
+"grub-pc પેકેજ સુધારાઈ રહ્યું છે. આ મેનુ તમને કયા ઉપકરણોમાં તમે grub-install આપમેળે સ્થાપિત "
+"કરવા માટે ચલાવવા માંગો છો તે પસંદગી કરવા દે છે, જો કોઈ હોય તો."
+
+#. Type: text
+#. Description
+#: ../templates.in:7001
+#, fuzzy
+#| msgid "${DEVICE} (${SIZE} MB; ${MODEL})"
+msgid "${DEVICE} (${SIZE} MB; ${PATH}) on ${DISK_SIZE} MB ${DISK_MODEL}"
+msgstr "${DEVICE} (${SIZE} એમબી; ${MODEL})"
+
+#. Type: boolean
+#. Description
+#: ../templates.in:9001
+#, fuzzy
+#| msgid ""
+#| "You chose not to install GRUB to any devices. If you continue, the boot "
+#| "loader may not be properly configured, and when this computer next starts "
+#| "up it will use whatever was previously in the boot sector. If there is an "
+#| "earlier version of GRUB 2 in the boot sector, it may be unable to load "
+#| "modules or handle the current configuration file."
+msgid ""
+"You chose not to install GRUB to any devices. If you continue, the boot "
+"loader may not be properly configured, and when this computer next starts up "
+"it will use whatever was previously configured. If there is an earlier "
+"version of GRUB 2 in the EFI system partition, it may be unable to load "
+"modules or handle the current configuration file."
+msgstr ""
+"તમે GRUB ને કોઈપણ ઉપકરણમાં સ્થાપિત કરવાનું પસંદ કરેલ નથી, જો તમે ચાલુ રાખશો તો, બૂટ "
+"લોડર કદાચ યોગ્ય રીતે ગોઠવાયેલ નહી હોય, અને આ કોમ્પ્યુટર હવે ફરી શરુ થાય ત્યારે તે પહેલાંનું "
+"જે હોય તે બૂટ વિભાગ ઉપયોગ કરશે. જો તેમાં પહેલાની GRUB 2 આવૃત્તિ બૂટ સેક્ટર પર હશે તો, "
+"કદાચ તે મોડ્યુલ લાવવા અથવા હાલનાં રુપરેખાંકન ફાઈલને સંભાળવામાં અસમર્થ બનશે."
+
+#. Type: string
+#. Description
+#: ../templates.in:10001
 msgid "kFreeBSD command line:"
 msgstr "kFreeBSD આદેશ:"
 
 #. Type: string
 #. Description
-#: ../templates.in:5001
+#: ../templates.in:10001
 msgid ""
 "The following kFreeBSD command line was extracted from /etc/default/grub or "
 "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is "
@@ -373,13 +426,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid "kFreeBSD default command line:"
 msgstr "kFreeBSD મૂળભૂત આદેશ:"
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid ""
 "The following string will be used as kFreeBSD parameters for the default "
 "menu entry but not for the recovery mode."
@@ -389,19 +442,19 @@ msgstr ""
 
 #. Type: title
 #. Description
-#: ../templates.in:7001
+#: ../templates.in:12001
 msgid "unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid ""
 "Your system has UEFI Secure Boot enabled in firmware, and the following "
 "kernels present on your system are unsigned:"
@@ -409,13 +462,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid " ${unsigned_versions}"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid ""
 "These kernels cannot be verified under Secure Boot.  To ensure your system "
 "remains bootable, GRUB will not be upgraded on your disk until these kernels "
diff --git a/debian/po/he.po b/debian/po/he.po
index 21f6a98..db8af79 100644
--- a/debian/po/he.po
+++ b/debian/po/he.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: grub_debian_po_he\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2019-07-12 11:37-0400\n"
+"POT-Creation-Date: 2020-04-09 12:18+0200\n"
 "PO-Revision-Date: 2014-12-17 18:35+0200\n"
 "Last-Translator: Omer Zak\n"
 "Language-Team: Hebrew <[e-mail]>\n"
@@ -71,6 +71,7 @@ msgstr ""
 #. Type: multiselect
 #. Description
 #: ../grub-pc.templates.in:3001 ../grub-pc.templates.in:4001
+#: ../templates.in:6001
 msgid "GRUB install devices:"
 msgstr "התקנים להתקנת GRUB:"
 
@@ -86,7 +87,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:3001
+#: ../grub-pc.templates.in:3001 ../templates.in:5001
 msgid ""
 "Running grub-install automatically is recommended in most situations, to "
 "prevent the installed GRUB core image from getting out of sync with GRUB "
@@ -124,7 +125,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../grub-pc.templates.in:4001
+#: ../grub-pc.templates.in:4001 ../templates.in:6001
 msgid ""
 "The GRUB boot loader was previously installed to a disk that is no longer "
 "present, or whose unique identifier has changed for some reason. It is "
@@ -153,7 +154,7 @@ msgstr "- ${DEVICE} (${SIZE} MB; ${PATH})"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid "Writing GRUB to boot device failed - continue?"
 msgstr "כשלון בכתיבת GRUB להתקן האתחול - להמשיך?"
 
@@ -162,12 +163,13 @@ msgstr "כשלון בכתיבת GRUB להתקן האתחול - להמשיך?"
 #. Type: boolean
 #. Description
 #: ../grub-pc.templates.in:7001 ../grub-pc.templates.in:8001
+#: ../templates.in:8001
 msgid "GRUB failed to install to the following devices:"
 msgstr "כשלון בהתקנת GRUB בהתקנים הבאים:"
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:7001
+#: ../grub-pc.templates.in:7001 ../templates.in:8001
 msgid ""
 "Do you want to continue anyway? If you do, your computer may not start up "
 "properly."
@@ -192,7 +194,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid "Continue without installing GRUB?"
 msgstr "להמשיך בלי להתקין GRUB?"
 
@@ -213,7 +215,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../grub-pc.templates.in:9001
+#: ../grub-pc.templates.in:9001 ../templates.in:9001
 msgid ""
 "If you are already using a different boot loader and want to carry on doing "
 "so, or if this is a special environment where you do not need a boot loader, "
@@ -370,15 +372,66 @@ msgid ""
 "server on every boot, this would preserve that behavior."
 msgstr ""
 
-#. Type: string
+#. Type: multiselect
 #. Description
 #: ../templates.in:5001
+msgid "GRUB EFI system partitions:"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../templates.in:5001
+#, fuzzy
+#| msgid ""
+#| "The grub-pc package is being upgraded. This menu allows you to select "
+#| "which devices you'd like grub-install to be automatically run for, if any."
+msgid ""
+"The grub-efi package is being upgraded. This menu allows you to select which "
+"EFI system partions you'd like grub-install to be automatically run for, if "
+"any."
+msgstr ""
+"חבילת grub-pc משתדרגת כעת. תפריט זה מאפשר לך לבחור בהתקנים שברצונך ש-grub-"
+"install ירוץ עליהם אוטומטית, באם יש כאלה."
+
+#. Type: text
+#. Description
+#: ../templates.in:7001
+#, fuzzy
+#| msgid "${DEVICE} (${SIZE} MB; ${MODEL})"
+msgid "${DEVICE} (${SIZE} MB; ${PATH}) on ${DISK_SIZE} MB ${DISK_MODEL}"
+msgstr "${DEVICE} (${SIZE} MB; ${MODEL})"
+
+#. Type: boolean
+#. Description
+#: ../templates.in:9001
+#, fuzzy
+#| msgid ""
+#| "You chose not to install GRUB to any devices. If you continue, the boot "
+#| "loader may not be properly configured, and when this computer next starts "
+#| "up it will use whatever was previously in the boot sector. If there is an "
+#| "earlier version of GRUB 2 in the boot sector, it may be unable to load "
+#| "modules or handle the current configuration file."
+msgid ""
+"You chose not to install GRUB to any devices. If you continue, the boot "
+"loader may not be properly configured, and when this computer next starts up "
+"it will use whatever was previously configured. If there is an earlier "
+"version of GRUB 2 in the EFI system partition, it may be unable to load "
+"modules or handle the current configuration file."
+msgstr ""
+"בחרת לא להתקין GRUB באף התקן. אם תמשיך, ייתכן שמנהל האתחול לא יהיה מוגדר "
+"כיאות, ובפעם הבאה שמחשבך יאותחל, הוא יאותחל ממה שהיה קודם ב-boot sector. אם "
+"יש גירסא מוקדמת יותר של GRUB 2 ב-boot sector, ייתכן שלא יהיה ביכולתה להטעין "
+"מודולים או להתמודד עם קובץ ההגדרות הנוכחי."
+
+#. Type: string
+#. Description
+#: ../templates.in:10001
 msgid "kFreeBSD command line:"
 msgstr "שורת הפקודה של kFreeBSD:"
 
 #. Type: string
 #. Description
-#: ../templates.in:5001
+#: ../templates.in:10001
 msgid ""
 "The following kFreeBSD command line was extracted from /etc/default/grub or "
 "the `kopt' parameter in GRUB Legacy's menu.lst. Please verify that it is "
@@ -390,13 +443,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid "kFreeBSD default command line:"
 msgstr "ברירת מחדל לשורת הפקודה של kFreeBSD:"
 
 #. Type: string
 #. Description
-#: ../templates.in:6001
+#: ../templates.in:11001
 msgid ""
 "The following string will be used as kFreeBSD parameters for the default "
 "menu entry but not for the recovery mode."
@@ -406,19 +459,19 @@ msgstr ""
 
 #. Type: title
 #. Description
-#: ../templates.in:7001
+#: ../templates.in:12001
 msgid "unsigned kernels"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.in:8001
+#: ../templates.in:13001
 msgid "Cannot upgrade Secure Boot enforcement policy due to unsigned kernels"
 msgstr ""