Rename the "Apply" button to "Reload"

The "Apply" button in the main window calls stopBarrier() immediately
followed by startBarrier(). The startBarrier() function reloads the
configuration. The fact that the "Apply" button applies configuration
changes is incidental; the "Start" button also applies new settings.

"Reload" more accurately describes the function that the button
performs.

Issue #284

src/gui/gui.ts

@@ -456,7 +456,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/gui/res/lang/gui_af-ZA.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/gui/res/lang/gui_ar.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/gui/res/lang/gui_bg-BG.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">Приложи</translation>
     </message>
     <message>

src/gui/res/lang/gui_ca-AD.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">Aplicar</translation>
     </message>
     <message>

src/gui/res/lang/gui_cs-CZ.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">&amp;Použít</translation>
     </message>
     <message>

src/gui/res/lang/gui_cy.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/gui/res/lang/gui_da.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">&amp;Anvend</translation>
     </message>
     <message>

src/gui/res/lang/gui_de.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">&amp;Anwenden</translation>
     </message>
     <message>

src/gui/res/lang/gui_es.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">Aplicar</translation>
     </message>
     <message>

src/gui/res/lang/gui_et-EE.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">Rakenda</translation>
     </message>
     <message>

src/gui/res/lang/gui_fi.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">Käytä</translation>
     </message>
     <message>

src/gui/res/lang/gui_fr.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">Appliquer</translation>
     </message>
     <message>

src/gui/res/lang/gui_gl.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/gui/res/lang/gui_grk.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/gui/res/lang/gui_he.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">&amp;שמור שינויים</translation>
     </message>
     <message>

src/gui/res/lang/gui_hi.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/gui/res/lang/gui_hr-HR.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">&amp;Primijeni</translation>
     </message>
     <message>

src/gui/res/lang/gui_hu-HU.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">Alkalmaz</translation>
     </message>
     <message>

src/gui/res/lang/gui_id.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/gui/res/lang/gui_is-IS.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/gui/res/lang/gui_it.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">Applica</translation>
     </message>
     <message>

src/gui/res/lang/gui_ja-JP.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">適用</translation>
     </message>
     <message>

src/gui/res/lang/gui_ko.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">적용(&amp;A)</translation>
     </message>
     <message>

src/gui/res/lang/gui_lt.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/gui/res/lang/gui_lv.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/gui/res/lang/gui_mr.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/gui/res/lang/gui_nl-NL.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">Toep&amp;assen</translation>
     </message>
     <message>

src/gui/res/lang/gui_no.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">&amp;Bruk</translation>
     </message>
     <message>

src/gui/res/lang/gui_pes-IR.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/gui/res/lang/gui_pl-PL.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">&amp;Zastosuj</translation>
     </message>
     <message>

src/gui/res/lang/gui_pt-BR.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">Aplicar</translation>
     </message>
     <message>

src/gui/res/lang/gui_pt-PT.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">&amp;Aplicar</translation>
     </message>
     <message>

src/gui/res/lang/gui_ro.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">Aplică</translation>
     </message>
     <message>

src/gui/res/lang/gui_ru.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">&amp;Применить</translation>
     </message>
     <message>

src/gui/res/lang/gui_si.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/gui/res/lang/gui_sk-SK.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/gui/res/lang/gui_sl-SI.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/gui/res/lang/gui_sq-AL.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">&amp;Apliko</translation>
     </message>
     <message>

src/gui/res/lang/gui_sr.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/gui/res/lang/gui_sv.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">Verkställ</translation>
     </message>
     <message>

src/gui/res/lang/gui_th-TH.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/gui/res/lang/gui_tr-TR.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">Uygula</translation>
     </message>
     <message>

src/gui/res/lang/gui_uk.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">Застосувати</translation>
     </message>
     <message>

src/gui/res/lang/gui_ur.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/gui/res/lang/gui_vi.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/gui/res/lang/gui_zh-CN.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">应用</translation>
     </message>
     <message>

src/gui/res/lang/gui_zh-TW.ts

@@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     </message>
     <message>
         <location filename="res/MainWindowBase.ui" line="373"/>
-        <source>&amp;Apply</source>
+        <source>&amp;Reload</source>
         <translation type="finished">應用</translation>
     </message>
     <message>

src/gui/src/MainWindow.cpp

@@ -763,14 +763,14 @@ void MainWindow::setBarrierState(qBarrierState state)
         disconnect (m_pButtonToggleStart, SIGNAL(clicked()), m_pActionStartBarrier, SLOT(trigger()));
         connect (m_pButtonToggleStart, SIGNAL(clicked()), m_pActionStopBarrier, SLOT(trigger()));
         m_pButtonToggleStart->setText(tr("&Stop"));
-        m_pButtonApply->setEnabled(true);
+        m_pButtonReload->setEnabled(true);
     }
     else if (state == barrierDisconnected)
     {
         disconnect (m_pButtonToggleStart, SIGNAL(clicked()), m_pActionStopBarrier, SLOT(trigger()));
         connect (m_pButtonToggleStart, SIGNAL(clicked()), m_pActionStartBarrier, SLOT(trigger()));
         m_pButtonToggleStart->setText(tr("&Start"));
-        m_pButtonApply->setEnabled(false);
+        m_pButtonReload->setEnabled(false);
     }
 
     bool connected = false;
@@ -1040,7 +1040,7 @@ void MainWindow::on_m_pButtonConfigureServer_clicked()
     showConfigureServer();
 }
 
-void MainWindow::on_m_pButtonApply_clicked()
+void MainWindow::on_m_pButtonReload_clicked()
 {
     restartBarrier();
 }

src/gui/src/MainWindow.h

@@ -205,7 +205,7 @@ public slots:
 private slots:
     void on_m_pCheckBoxAutoConfig_toggled(bool checked);
     void on_m_pComboServerList_currentIndexChanged(QString );
-    void on_m_pButtonApply_clicked();
+    void on_m_pButtonReload_clicked();
     void installBonjour();
 
 };

src/gui/src/MainWindowBase.ui

@@ -278,12 +278,12 @@
        </spacer>
       </item>
       <item>
-       <widget class="QPushButton" name="m_pButtonApply">
+       <widget class="QPushButton" name="m_pButtonReload">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="text">
-         <string>&amp;Apply</string>
+         <string>&amp;Reload</string>
         </property>
        </widget>
       </item>