Changeset 91503 in vbox for trunk/src/VBox/Main/src-server/generic

Timestamp:

Oct 1, 2021 8:57:59 AM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

147192

Message:

Main: bugref:1909: Added missed translation marks, removed redundant ones. Expanded one macro to make the lupdate get string correctly. Removed GuestBase::setErrorExternal and changed calls from it to setErrorBoth to handle translation correctly.

File:

• trunk/src/VBox/Main/src-server/generic/NetIf-generic.cpp (modified) (9 diffs)

trunk/src/VBox/Main/src-server/generic/NetIf-generic.cpp

@@ -39 +39 @@
 #include "ProgressImpl.h"
 #include "VirtualBoxImpl.h"
+#include "VBoxNls.h"
 #include "Global.h"
 #include "netif.h"
 
 #define VBOXNETADPCTL_NAME "VBoxNetAdpCtl"
+
+DECLARE_TRANSLATION_CONTEXT(NetIfGeneric);
+
 
 static int NetIfAdpCtl(const char * pcszIfName, const char *pszAddr, const char *pszOption, const char *pszMask)
@@ -204 +208 @@
     {
         hrc = progress->init(pVirtualBox, host,
-                             "Creating host only network interface",
+                             NetIfGeneric::tr("Creating host only network interface"),
                              FALSE /* aCancelable */);
         if (SUCCEEDED(hrc))
@@ -217 +221 @@
                                            COM_IIDOF(IHostNetworkInterface),
                                            HostNetworkInterface::getStaticComponentName(),
-                                           "Failed to get program path, vrc=%Rrc\n", vrc);
+                                           NetIfGeneric::tr("Failed to get program path, vrc=%Rrc\n"), vrc);
                 return vrc;
             }
@@ -266 +270 @@
                                                        COM_IIDOF(IHostNetworkInterface),
                                                        HostNetworkInterface::getStaticComponentName(),
-                                                       "Failed to get config info for %s (as reported by '" VBOXNETADPCTL_NAME " add')\n", szBuf);
+                                                       NetIfGeneric::tr("Failed to get config info for %s (as reported by 'VBoxNetAdpCtl add')\n"),
+                                                       szBuf);
                         }
                         else
@@ -285 +290 @@
                                                    COM_IIDOF(IHostNetworkInterface),
                                                    HostNetworkInterface::getStaticComponentName(),
-                                                   "Failed to execute '%s' - exit status: %d", szAdpCtl, vrc);
+                                                   NetIfGeneric::tr("Failed to execute '%s' - exit status: %d"), szAdpCtl, vrc);
                         vrc = VERR_INTERNAL_ERROR;
                     }
@@ -295 +300 @@
                                                COM_IIDOF(IHostNetworkInterface),
                                                HostNetworkInterface::getStaticComponentName(),
-                                               "Failed to execute '%s' (errno %d). Check permissions!",
+                                               NetIfGeneric::tr("Failed to execute '%s' (errno %d). Check permissions!"),
                                                szAdpCtl, errno);
                     pclose(fp);
@@ -307 +312 @@
                                            COM_IIDOF(IHostNetworkInterface),
                                            HostNetworkInterface::getStaticComponentName(),
-                                           "Failed to execute '%s' (errno %d / %Rrc). Check permissions!",
+                                           NetIfGeneric::tr("Failed to execute '%s' (errno %d / %Rrc). Check permissions!"),
                                            szAdpCtl, errno, vrc);
             }
@@ -352 +357 @@
         Utf8Str strIfName(ifname);
 
-        hrc = progress->init(pVirtualBox, host, "Removing host network interface", FALSE /* aCancelable */);
+        hrc = progress->init(pVirtualBox, host, NetIfGeneric::tr("Removing host network interface"), FALSE /* aCancelable */);
         if (SUCCEEDED(hrc))
         {
@@ -361 +366 @@
                                            COM_IIDOF(IHostNetworkInterface),
                                            HostNetworkInterface::getStaticComponentName(),
-                                           "Failed to execute '" VBOXNETADPCTL_NAME " %s remove' (%Rrc)",
+                                           NetIfGeneric::tr("Failed to execute 'VBoxNetAdpCtl %s remove' (%Rrc)"),
                                            strIfName.c_str(), vrc);
             else