Merging upstream version 7.0.18-dfsg.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 30 insertions, 11 deletions

diff --git a/src/VBox/Frontends/VBoxShell/vboxshell.py b/src/VBox/Frontends/VBoxShell/vboxshell.py
index bd0222c7..f1083dd1 100755
--- a/src/VBox/Frontends/VBoxShell/vboxshell.py
+++ b/src/VBox/Frontends/VBoxShell/vboxshell.py
@@ -1,7 +1,28 @@
-#!/usr/bin/env python
+#!/bin/sh
 # -*- coding: utf-8 -*-
 # $Id: vboxshell.py $
 
+# The following checks for the right (i.e. most recent) Python binary available
+# and re-starts the script using that binary (like a shell wrapper).
+#
+# Using a shebang like "#!/bin/env python" on newer Fedora/Debian distros is banned [1]
+# and also won't work on other newer distros (Ubuntu >= 23.10), as those only ship
+# python3 without a python->python3 symlink anymore.
+#
+# Note: As Python 2 is EOL, we consider this last (and hope for the best).
+#
+# [1] https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/2PD5RNJRKPN2DVTNGJSBHR5RUSVZSDZI/
+''':'
+for python_bin in python3 python python2
+do
+    type "$python_bin" > /dev/null 2>&1 && exec "$python_bin" "$0" "$@"
+done
+echo >&2 "ERROR: Python not found! Please install this first in order to run this program."
+exit 1
+':'''
+
+from __future__ import print_function
+
 """
 VirtualBox Python Shell.
 
@@ -19,8 +40,6 @@ Finally, shell allows arbitrary custom extensions, just create
 P.S. Our apologies for the code quality.
 """
 
-from __future__ import print_function
-
 __copyright__ = \
 """
 Copyright (C) 2009-2023 Oracle and/or its affiliates.
@@ -43,7 +62,7 @@ along with this program; if not, see <https://www.gnu.org/licenses>.
 
 SPDX-License-Identifier: GPL-3.0-only
 """
-__version__ = "$Revision: 155244 $"
+__version__ = "$Revision: 162975 $"
 
 
 import gc
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts
index 8b92199e..1e3150da 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts
@@ -4843,7 +4843,7 @@
     <message>
         <source>Dynamically allocated storage</source>
         <comment>MediumVariant</comment>
-        <translation>Almacenamiento resevado dinámicamente</translation>
+        <translation>Almacenamiento reservado dinámicamente</translation>
     </message>
     <message>
         <source>New dynamically allocated storage</source>
@@ -4853,7 +4853,7 @@
     <message>
         <source>Dynamically allocated differencing storage</source>
         <comment>MediumVariant</comment>
-        <translation>Almacenamiento diferenciado resevado dinámicamente</translation>
+        <translation>Almacenamiento diferenciado reservado dinámicamente</translation>
     </message>
     <message>
         <source>Fixed size storage</source>
@@ -4878,7 +4878,7 @@
     <message>
         <source>Dynamically allocated compressed storage</source>
         <comment>MediumVariant</comment>
-        <translation>Almacenamiento comprimido resevado dinámicamente</translation>
+        <translation>Almacenamiento comprimido reservado dinámicamente</translation>
     </message>
     <message>
         <source>Dynamically allocated differencing compressed storage</source>
@@ -31727,7 +31727,7 @@ Versión %1</translation>
     </message>
     <message>
         <source>Dynamically allocated storage</source>
-        <translation type="obsolete">Almacenamiento resevado dinámicamente</translation>
+        <translation type="obsolete">Almacenamiento reservado dinámicamente</translation>
     </message>
     <message>
         <source>Fixed size storage</source>
@@ -31833,12 +31833,12 @@ Versión %1</translation>
     <message>
         <source>Dynamically allocated storage</source>
         <comment>MediumVariant</comment>
-        <translation type="vanished">Almacenamiento resevado dinámicamente</translation>
+        <translation type="vanished">Almacenamiento reservado dinámicamente</translation>
     </message>
     <message>
         <source>Dynamically allocated differencing storage</source>
         <comment>MediumVariant</comment>
-        <translation type="vanished">Almacenamiento diferenciado resevado dinámicamente</translation>
+        <translation type="vanished">Almacenamiento diferenciado reservado dinámicamente</translation>
     </message>
     <message>
         <source>Fixed size storage</source>
@@ -31863,7 +31863,7 @@ Versión %1</translation>
     <message>
         <source>Dynamically allocated compressed storage</source>
         <comment>MediumVariant</comment>
-        <translation type="vanished">Almacenamiento comprimido resevado dinámicamente</translation>
+        <translation type="vanished">Almacenamiento comprimido reservado dinámicamente</translation>
     </message>
     <message>
         <source>Dynamically allocated differencing compressed storage</source>