rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename the "Apply" button to "Reload" (#292) 

Rename the "Apply" button to "Reload"
This commit is contained in:
Adrian Lucrèce Céleste 2019-05-14 16:07:44 -04:00 committed by GitHub
parent ab40f52f4b c54424794f
commit a82b845e07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
95 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/gui.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_af-ZA.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_af-ZA.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_ar.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_ar.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_bg-BG.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_bg-BG.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_ca-AD.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_ca-AD.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_cs-CZ.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_cs-CZ.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_cy.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_cy.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_da.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_da.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_de.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_de.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_es.qm
View File

Binary file not shown.

4
src/gui/res/lang/gui_es.ts
View File

@ -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>
@ -1408,4 +1408,4 @@ Server response:
<translation type="unfinished"></translation>
</message>
</context>
</TS>
</TS>

BIN
src/gui/res/lang/gui_et-EE.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_et-EE.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_fi.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_fi.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_fr.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_fr.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_gl.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_gl.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_grk.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_grk.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_he.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_he.ts
View File

@ -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>

2
src/gui/res/lang/gui_hi.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_hr-HR.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_hr-HR.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_hu-HU.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_hu-HU.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_id.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_id.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_is-IS.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_is-IS.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_it.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_it.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_ja-JP.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_ja-JP.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_ko.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_ko.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_lt.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_lt.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_lv.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_lv.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_mr.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_mr.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_nl-NL.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_nl-NL.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_no.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_no.ts
View File

@ -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>

2
src/gui/res/lang/gui_pes-IR.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_pl-PL.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_pl-PL.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_pt-BR.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_pt-BR.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_pt-PT.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_pt-PT.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_ro.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_ro.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_ru.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_ru.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_si.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_si.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_sk-SK.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_sk-SK.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_sl-SI.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_sl-SI.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_sq-AL.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_sq-AL.ts
View File

@ -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>

2
src/gui/res/lang/gui_sr.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_sv.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_sv.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_th-TH.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_th-TH.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_tr-TR.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_tr-TR.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_uk.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_uk.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_ur.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_ur.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_vi.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_vi.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_zh-CN.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_zh-CN.ts
View File

@ -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>

BIN
src/gui/res/lang/gui_zh-TW.qm
View File

Binary file not shown.

2
src/gui/res/lang/gui_zh-TW.ts
View File

@ -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>

6
src/gui/src/MainWindow.cpp
View File

@ -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();
}

2
src/gui/src/MainWindow.h
View File

@ -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();
};

4
src/gui/src/MainWindowBase.ui
View File

@ -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>