Merge pull request #1068 from subutai-io/dev

Dev
subutai-io · May 30, 2018 · 483d1fa · 483d1fa
2 parents ae49381 + b02d51a
commit 483d1fa
Show file tree

Hide file tree

Showing 7 changed files with 214 additions and 211 deletions.
diff --git a/SubutaiControlCenter_en_US.ts b/SubutaiControlCenter_en_US.ts
diff --git a/SubutaiControlCenter_pt_BR.ts b/SubutaiControlCenter_pt_BR.ts
diff --git a/SubutaiControlCenter_ru_RU.ts b/SubutaiControlCenter_ru_RU.ts
diff --git a/hub/forms/DlgPeer.ui b/hub/forms/DlgPeer.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>636</width>
-    <height>520</height>
+    <height>510</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -283,7 +283,7 @@
       <item row="2" column="0">
        <widget class="QLabel" name="lbl_disk">
         <property name="toolTip">
-         <string>Disk size of the Peer in GB</string>
+         <string>Peer's disk size in GB</string>
         </property>
         <property name="text">
          <string>Disk</string>

diff --git a/hub/src/DlgPeer.cpp b/hub/src/DlgPeer.cpp
@@ -302,7 +302,7 @@ bool DlgPeer::check_configs(){
     }
 
     if(cpu < 1){
-        CNotificationObserver::Error(tr("Number of CPU can't be less than 1"), DlgNotification::N_NO_ACTION);
+        CNotificationObserver::Error(tr("Quantity of CPU can't be less than 1"), DlgNotification::N_NO_ACTION);
         return false;
     }
 
@@ -536,7 +536,7 @@ void DlgPeer::sshPeer(){
 
 void DlgPeer::destroyPeer(){
     if(hub_available){
-        CNotificationObserver::Error(tr("You can't destroy the Peer until it's registered to the the Bazaar. "
+        CNotificationObserver::Error(tr("You can't destroy the Peer until it's registered to the Bazaar. "
                                         "Please run 'unregister' to unregister it from the Bazaar"), DlgNotification::N_NO_ACTION);
         return;
     }

diff --git a/hub/src/PeerController.cpp b/hub/src/PeerController.cpp
@@ -42,26 +42,23 @@ void CPeerController::refresh() {
 const QString& CPeerController::status_description(const QString &status){
     static std::map<QString, QString> dct_desp = {
 
-        {"aborted", tr ("The Peer is in an aborted state. This means that it was abruptly "
-                        "stopped without properly closing the session. Press `start` "
-                        "to resume this virtual machine. If any problems persist, you may "
-                        "have to destroy and restart the virtual machine.")},
+        {"aborted", tr ("The Peer is aborted because it was abruptly stopped. "
+                        "Press start to resume the virtual machine. "
+                        "If you still face the problem, you can destroy and restart it")},
 
         {"gurumeditation", tr ("The Peer is in the \"guru meditation\" state. This is a rare case which means "
                                "that an internal error in VirtualBox caused the Peer to fail. This is always "
                                "the sign of a bug in VirtualBox. You can try to bring your VM back online "
                                "with a `start`.")},
 
-        {"running", tr ("The Peer is running. To stop this Peer, you can press `stop`")},
+        {"running", tr ("The Peer is running. You can press `stop` to shut it down")},
 
         {"poweroff", tr ("The Peer is powered off. To restart the Peer, simply press 'start'")},
 
-        {"broken", tr ("The VM for the Peer is not created yet. Please wait installation process "
-                       "if you have started.")},
+        {"broken", tr ("The VM for the Peer is not created yet. "
+                       "If you have started the installation process, please wait for it to finish")},
 
-        {"not ready", tr ("The Peer is not ready. This means Peer management is loading, "
-                          "which usually takes 30-60 seconds to be ready. "
-                          "You can press 'reload' to reload the Peer")},
+        {"not ready", tr ("Peer’s management is loading, this might take some time.")},
 
         {"not_created", tr ("The environment has not yet been created. Run `vagrant up` to "
                             "create the environment. If a machine is not created, only the "

diff --git a/hub/src/TrayControlWindow.cpp b/hub/src/TrayControlWindow.cpp
@@ -624,7 +624,7 @@ void TrayControlWindow::launch_p2p() {
     case P2PStatus_checker::P2P_RUNNING:
       CNotificationObserver::Info(
           QObject::tr(
-              "P2P is running. If you have troubles please restart it."),
+              "P2P is running. If you have troubles, please restart it."),
           DlgNotification::N_STOP_P2P);
       break;
     case P2PStatus_checker::P2P_LOADING: