儲存庫 vbox 的更動 18381

時間撮記:

2009-3-27 上午11:10:51 (16 年 以前)

作者:

vboxsync

訊息:

FE/Qt4: tr() update #1 (Global Settings / Network page).

位置:

trunk/src/VBox/Frontends/VirtualBox/src

檔案:

• VBoxGLSettingsNetwork.cpp (修改) (12 筆差異)
• VBoxVMSettingsNetwork.cpp (修改) (4 筆差異)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGLSettingsNetwork.cpp

@@ -126 +126 @@
              QHostAddress (mInterfaceAddress).protocol() != QAbstractSocket::IPv4Protocol))
         {
-            aWarning = QTreeWidget::tr ("host IPv4 address of <b>%1</b> is wrong").arg (text (0));
+            aWarning = VBoxGLSettingsNetwork::tr ("host IPv4 address of <b>%1</b> is wrong").arg (text (0));
             return false;
         }
@@ -133 +133 @@
              QHostAddress (mInterfaceMask).protocol() != QAbstractSocket::IPv4Protocol))
         {
-            aWarning = QTreeWidget::tr ("host IPv4 network mask of <b>%1</b> is wrong").arg (text (0));
+            aWarning = VBoxGLSettingsNetwork::tr ("host IPv4 network mask of <b>%1</b> is wrong").arg (text (0));
             return false;
         }
@@ -142 +142 @@
                  QHostAddress (mInterfaceAddress6).protocol() != QAbstractSocket::IPv6Protocol))
             {
-                aWarning = QTreeWidget::tr ("host IPv6 address of <b>%1</b> is wrong").arg (text (0));
+                aWarning = VBoxGLSettingsNetwork::tr ("host IPv6 address of <b>%1</b> is wrong").arg (text (0));
                 return false;
             }
@@ -154 +154 @@
             QHostAddress (mDhcpServerAddress).protocol() != QAbstractSocket::IPv4Protocol)
         {
-            aWarning = QTreeWidget::tr ("DHCP server address of <b>%1</b> is wrong").arg (text (0));
+            aWarning = VBoxGLSettingsNetwork::tr ("DHCP server address of <b>%1</b> is wrong").arg (text (0));
             return false;
         }
@@ -160 +160 @@
             QHostAddress (mDhcpServerMask).protocol() != QAbstractSocket::IPv4Protocol)
         {
-            aWarning = QTreeWidget::tr ("DHCP server mask of <b>%1</b> is wrong").arg (text (0));
+            aWarning = VBoxGLSettingsNetwork::tr ("DHCP server mask of <b>%1</b> is wrong").arg (text (0));
             return false;
         }
@@ -166 +166 @@
             QHostAddress (mDhcpLowerAddress).protocol() != QAbstractSocket::IPv4Protocol)
         {
-            aWarning = QTreeWidget::tr ("DHCP lower address bound of <b>%1</b> is wrong").arg (text (0));
+            aWarning = VBoxGLSettingsNetwork::tr ("DHCP lower address bound of <b>%1</b> is wrong").arg (text (0));
             return false;
         }
@@ -172 +172 @@
             QHostAddress (mDhcpUpperAddress).protocol() != QAbstractSocket::IPv4Protocol)
         {
-            aWarning = QTreeWidget::tr ("DHCP upper address bound of <b>%1</b> is wrong").arg (text (0));
+            aWarning = VBoxGLSettingsNetwork::tr ("DHCP upper address bound of <b>%1</b> is wrong").arg (text (0));
             return false;
         }
@@ -189 +189 @@
 
     /* Host-only Interface information */
-    buffer = hdr.arg (QTreeWidget::tr ("Host Interface"))
-                .arg (mDhcpClientEnabled ? QTreeWidget::tr ("Automatically configured", "interface")
-                                         : QTreeWidget::tr ("Manually configured", "interface"));
+    buffer = hdr.arg (VBoxGLSettingsNetwork::tr ("Host Interface"))
+                .arg (mDhcpClientEnabled ? VBoxGLSettingsNetwork::tr ("Automatically configured", "interface")
+                                         : VBoxGLSettingsNetwork::tr ("Manually configured", "interface"));
     data += buffer;
     tip += buffer;
@@ -197 +197 @@
     if (!mDhcpClientEnabled)
     {
-        buffer = sub.arg (QTreeWidget::tr ("IPv4 Address"))
-                    .arg (mInterfaceAddress.isEmpty() ? QTreeWidget::tr ("Not set", "address")
+        buffer = sub.arg (VBoxGLSettingsNetwork::tr ("IPv4 Address"))
+                    .arg (mInterfaceAddress.isEmpty() ? VBoxGLSettingsNetwork::tr ("Not set", "address")
                                                       : mInterfaceAddress) +
-                 sub.arg (QTreeWidget::tr ("IPv4 Mask"))
-                    .arg (mInterfaceMask.isEmpty() ? QTreeWidget::tr ("Not set", "mask")
+                 sub.arg (VBoxGLSettingsNetwork::tr ("IPv4 Mask"))
+                    .arg (mInterfaceMask.isEmpty() ? VBoxGLSettingsNetwork::tr ("Not set", "mask")
                                                    : mInterfaceMask);
         tip += buffer;
@@ -207 +207 @@
         if (mIpv6Supported)
         {
-            buffer = sub.arg (QTreeWidget::tr ("IPv6 Address"))
-                        .arg (mInterfaceAddress6.isEmpty() ? QTreeWidget::tr ("Not set", "address")
+            buffer = sub.arg (VBoxGLSettingsNetwork::tr ("IPv6 Address"))
+                        .arg (mInterfaceAddress6.isEmpty() ? VBoxGLSettingsNetwork::tr ("Not set", "address")
                                                            : mInterfaceAddress6) +
-                     sub.arg (QTreeWidget::tr ("IPv6 Mask Length"))
-                        .arg (mInterfaceMaskLength6.isEmpty() ? QTreeWidget::tr ("Not set", "length")
+                     sub.arg (VBoxGLSettingsNetwork::tr ("IPv6 Mask Length"))
+                        .arg (mInterfaceMaskLength6.isEmpty() ? VBoxGLSettingsNetwork::tr ("Not set", "length")
                                                               : mInterfaceMaskLength6);
             tip += buffer;
@@ -218 +218 @@
 
     /* DHCP Server information */
-    buffer = hdr.arg (QTreeWidget::tr ("DHCP Server"))
-                .arg (mDhcpServerEnabled ? QTreeWidget::tr ("Enabled", "server")
-                                         : QTreeWidget::tr ("Disabled", "server"));
+    buffer = hdr.arg (VBoxGLSettingsNetwork::tr ("DHCP Server"))
+                .arg (mDhcpServerEnabled ? VBoxGLSettingsNetwork::tr ("Enabled", "server")
+                                         : VBoxGLSettingsNetwork::tr ("Disabled", "server"));
     data += buffer;
     tip += buffer;
@@ -226 +226 @@
     if (mDhcpServerEnabled)
     {
-        buffer = sub.arg (QTreeWidget::tr ("Address"))
-                    .arg (mDhcpServerAddress.isEmpty() ? QTreeWidget::tr ("Not set", "address")
+        buffer = sub.arg (VBoxGLSettingsNetwork::tr ("Address"))
+                    .arg (mDhcpServerAddress.isEmpty() ? VBoxGLSettingsNetwork::tr ("Not set", "address")
                                                        : mDhcpServerAddress) +
-                 sub.arg (QTreeWidget::tr ("Mask"))
-                    .arg (mDhcpServerMask.isEmpty() ? QTreeWidget::tr ("Not set", "mask")
+                 sub.arg (VBoxGLSettingsNetwork::tr ("Mask"))
+                    .arg (mDhcpServerMask.isEmpty() ? VBoxGLSettingsNetwork::tr ("Not set", "mask")
                                                     : mDhcpServerMask) +
-                 sub.arg (QTreeWidget::tr ("Lower Bound"))
-                    .arg (mDhcpLowerAddress.isEmpty() ? QTreeWidget::tr ("Not set", "bound")
+                 sub.arg (VBoxGLSettingsNetwork::tr ("Lower Bound"))
+                    .arg (mDhcpLowerAddress.isEmpty() ? VBoxGLSettingsNetwork::tr ("Not set", "bound")
                                                       : mDhcpLowerAddress) +
-                 sub.arg (QTreeWidget::tr ("Upper Bound"))
-                    .arg (mDhcpUpperAddress.isEmpty() ? QTreeWidget::tr ("Not set", "bound")
+                 sub.arg (VBoxGLSettingsNetwork::tr ("Upper Bound"))
+                    .arg (mDhcpUpperAddress.isEmpty() ? VBoxGLSettingsNetwork::tr ("Not set", "bound")
                                                       : mDhcpUpperAddress);
         tip += buffer;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsNetwork.cpp

@@ -189 +189 @@
             QString name (mDetails->currentName (type));
             info += line.arg (tr ("Adapter", "network"))
-                        .arg (name.isEmpty() ? tr ("not selected", "adapter") : name);
+                        .arg (name.isEmpty() ? tr ("Not selected", "adapter") : name);
             break;
         }
@@ -196 +196 @@
             QString name (mDetails->currentName (type));
             info += line.arg (tr ("Network", "internal"))
-                        .arg (name.isEmpty() ? tr ("not selected", "network") : name);
+                        .arg (name.isEmpty() ? tr ("Not selected", "network") : name);
             break;
         }
@@ -203 +203 @@
             QString name (mDetails->currentName (type));
             info += line.arg (tr ("Interface", "network"))
-                        .arg (name.isEmpty() ? tr ("not selected", "interface") : name);
+                        .arg (name.isEmpty() ? tr ("Not selected", "interface") : name);
             break;
         }
@@ -214 +214 @@
     QString macAddress (mDetails->property ("MAC_Address").toString());
     info += line.arg (tr ("MAC Address"))
-                .arg (macAddress.isEmpty() ? tr ("not selected", "address") : macAddress);
+                .arg (macAddress.isEmpty() ? tr ("Not selected", "address") : macAddress);
     bool cableConnected (mDetails->property ("Cable_Connected").toBool());
     info += line.arg (tr ("Cable"))
-                .arg (cableConnected ? tr ("connected", "cable") : tr ("not connected", "cable"));
+                .arg (cableConnected ? tr ("Connected", "cable") : tr ("Not connected", "cable"));
 #endif