diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2019-07-18 01:31:55 -0400 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2019-07-18 01:31:55 -0400 |
| commit | 0f98c212db6e4cfd750dc1a52a31ddf9396a5e07 (patch) | |
| tree | bd0bd43b383bccc43d1950fd356472d69f9cd0f1 /src/gui | |
| parent | d8c416864c505aea70c70fd0d5f7991aa50d2ff9 (diff) | |
| parent | a916009d4b29995ea8ad61ad47a51c2ee1fa80bc (diff) | |
Update upstream source from tag 'upstream/2.3.0+dfsg'
Update to upstream version '2.3.0+dfsg'
with Debian dir f701d582fe3b6bb5189dbf035102670db9c2516b
Diffstat (limited to 'src/gui')
101 files changed, 90 insertions, 67 deletions
diff --git a/src/gui/gui.ts b/src/gui/gui.ts index 861a496..99bc7aa 100644 --- a/src/gui/gui.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/gui/res/lang/gui_af-ZA.qm b/src/gui/res/lang/gui_af-ZA.qm Binary files differindex be651ee..9dad8df 100644 --- a/src/gui/res/lang/gui_af-ZA.qm +++ b/src/gui/res/lang/gui_af-ZA.qm diff --git a/src/gui/res/lang/gui_af-ZA.ts b/src/gui/res/lang/gui_af-ZA.ts index 446c9a4..7ff6304 100644 --- a/src/gui/res/lang/gui_af-ZA.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/gui/res/lang/gui_ar.qm b/src/gui/res/lang/gui_ar.qm Binary files differindex dfc4afa..a375ebb 100644 --- a/src/gui/res/lang/gui_ar.qm +++ b/src/gui/res/lang/gui_ar.qm diff --git a/src/gui/res/lang/gui_ar.ts b/src/gui/res/lang/gui_ar.ts index c934dba..84ae1e6 100644 --- a/src/gui/res/lang/gui_ar.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/gui/res/lang/gui_bg-BG.qm b/src/gui/res/lang/gui_bg-BG.qm Binary files differindex a93d7af..013137d 100644 --- a/src/gui/res/lang/gui_bg-BG.qm +++ b/src/gui/res/lang/gui_bg-BG.qm diff --git a/src/gui/res/lang/gui_bg-BG.ts b/src/gui/res/lang/gui_bg-BG.ts index fc6988e..6a373d8 100644 --- a/src/gui/res/lang/gui_bg-BG.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="finished">Приложи</translation> </message> <message> diff --git a/src/gui/res/lang/gui_ca-AD.qm b/src/gui/res/lang/gui_ca-AD.qm Binary files differindex 45e8f7f..351c40d 100644 --- a/src/gui/res/lang/gui_ca-AD.qm +++ b/src/gui/res/lang/gui_ca-AD.qm diff --git a/src/gui/res/lang/gui_ca-AD.ts b/src/gui/res/lang/gui_ca-AD.ts index 3ccc7eb..34093d9 100644 --- a/src/gui/res/lang/gui_ca-AD.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="finished">Aplicar</translation> </message> <message> diff --git a/src/gui/res/lang/gui_cs-CZ.qm b/src/gui/res/lang/gui_cs-CZ.qm Binary files differindex 01a1b70..1ac02c8 100644 --- a/src/gui/res/lang/gui_cs-CZ.qm +++ b/src/gui/res/lang/gui_cs-CZ.qm diff --git a/src/gui/res/lang/gui_cs-CZ.ts b/src/gui/res/lang/gui_cs-CZ.ts index fd639fa..fd7b9c7 100644 --- a/src/gui/res/lang/gui_cs-CZ.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="finished">&Použít</translation> </message> <message> diff --git a/src/gui/res/lang/gui_cy.qm b/src/gui/res/lang/gui_cy.qm Binary files differindex a62d578..87bc58c 100644 --- a/src/gui/res/lang/gui_cy.qm +++ b/src/gui/res/lang/gui_cy.qm diff --git a/src/gui/res/lang/gui_cy.ts b/src/gui/res/lang/gui_cy.ts index 15b59ea..be9cd1d 100644 --- a/src/gui/res/lang/gui_cy.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/gui/res/lang/gui_da.qm b/src/gui/res/lang/gui_da.qm Binary files differindex 280988f..f78dbb7 100644 --- a/src/gui/res/lang/gui_da.qm +++ b/src/gui/res/lang/gui_da.qm diff --git a/src/gui/res/lang/gui_da.ts b/src/gui/res/lang/gui_da.ts index d910ccb..2b17c0b 100644 --- a/src/gui/res/lang/gui_da.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="finished">&Anvend</translation> </message> <message> diff --git a/src/gui/res/lang/gui_de.qm b/src/gui/res/lang/gui_de.qm Binary files differindex 095a698..eb0bb40 100644 --- a/src/gui/res/lang/gui_de.qm +++ b/src/gui/res/lang/gui_de.qm diff --git a/src/gui/res/lang/gui_de.ts b/src/gui/res/lang/gui_de.ts index 4b826f5..67eb994 100644 --- a/src/gui/res/lang/gui_de.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="finished">&Anwenden</translation> </message> <message> diff --git a/src/gui/res/lang/gui_es.qm b/src/gui/res/lang/gui_es.qm Binary files differindex f9057ee..d09974e 100644 --- a/src/gui/res/lang/gui_es.qm +++ b/src/gui/res/lang/gui_es.qm diff --git a/src/gui/res/lang/gui_es.ts b/src/gui/res/lang/gui_es.ts index 98ee4f9..4b3523a 100644 --- a/src/gui/res/lang/gui_es.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="finished">Aplicar</translation> </message> <message> @@ -1408,4 +1408,4 @@ Server response: <translation type="unfinished"></translation> </message> </context> -</TS>
\ No newline at end of file +</TS> diff --git a/src/gui/res/lang/gui_et-EE.qm b/src/gui/res/lang/gui_et-EE.qm Binary files differindex 2ff9398..7c2fc9b 100644 --- a/src/gui/res/lang/gui_et-EE.qm +++ b/src/gui/res/lang/gui_et-EE.qm diff --git a/src/gui/res/lang/gui_et-EE.ts b/src/gui/res/lang/gui_et-EE.ts index 1e1ea57..033b9d7 100644 --- a/src/gui/res/lang/gui_et-EE.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="finished">Rakenda</translation> </message> <message> diff --git a/src/gui/res/lang/gui_fi.qm b/src/gui/res/lang/gui_fi.qm Binary files differindex 46f69c1..1e7178c 100644 --- a/src/gui/res/lang/gui_fi.qm +++ b/src/gui/res/lang/gui_fi.qm diff --git a/src/gui/res/lang/gui_fi.ts b/src/gui/res/lang/gui_fi.ts index 9fe0b60..e5aea17 100644 --- a/src/gui/res/lang/gui_fi.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="finished">Käytä</translation> </message> <message> diff --git a/src/gui/res/lang/gui_fr.qm b/src/gui/res/lang/gui_fr.qm Binary files differindex 8251f4c..38116ce 100644 --- a/src/gui/res/lang/gui_fr.qm +++ b/src/gui/res/lang/gui_fr.qm diff --git a/src/gui/res/lang/gui_fr.ts b/src/gui/res/lang/gui_fr.ts index 8d96c5b..ed37997 100644 --- a/src/gui/res/lang/gui_fr.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="finished">Appliquer</translation> </message> <message> diff --git a/src/gui/res/lang/gui_gl.qm b/src/gui/res/lang/gui_gl.qm Binary files differindex 11d78e1..16faa72 100644 --- a/src/gui/res/lang/gui_gl.qm +++ b/src/gui/res/lang/gui_gl.qm diff --git a/src/gui/res/lang/gui_gl.ts b/src/gui/res/lang/gui_gl.ts index 727878f..2f89802 100644 --- a/src/gui/res/lang/gui_gl.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/gui/res/lang/gui_grk.qm b/src/gui/res/lang/gui_grk.qm Binary files differindex 9793d0d..0d921a3 100644 --- a/src/gui/res/lang/gui_grk.qm +++ b/src/gui/res/lang/gui_grk.qm diff --git a/src/gui/res/lang/gui_grk.ts b/src/gui/res/lang/gui_grk.ts index 03b71e2..ffbede5 100644 --- a/src/gui/res/lang/gui_grk.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/gui/res/lang/gui_he.qm b/src/gui/res/lang/gui_he.qm Binary files differindex 2ceeae5..43fa7af 100644 --- a/src/gui/res/lang/gui_he.qm +++ b/src/gui/res/lang/gui_he.qm diff --git a/src/gui/res/lang/gui_he.ts b/src/gui/res/lang/gui_he.ts index 192d2a1..5a1ddcf 100644 --- a/src/gui/res/lang/gui_he.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="finished">&שמור שינויים</translation> </message> <message> diff --git a/src/gui/res/lang/gui_hi.ts b/src/gui/res/lang/gui_hi.ts index a6ba550..57b409e 100644 --- a/src/gui/res/lang/gui_hi.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/gui/res/lang/gui_hr-HR.qm b/src/gui/res/lang/gui_hr-HR.qm Binary files differindex 6c3bd19..a7e5563 100644 --- a/src/gui/res/lang/gui_hr-HR.qm +++ b/src/gui/res/lang/gui_hr-HR.qm diff --git a/src/gui/res/lang/gui_hr-HR.ts b/src/gui/res/lang/gui_hr-HR.ts index 89e437a..4695e4e 100644 --- a/src/gui/res/lang/gui_hr-HR.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="finished">&Primijeni</translation> </message> <message> diff --git a/src/gui/res/lang/gui_hu-HU.qm b/src/gui/res/lang/gui_hu-HU.qm Binary files differindex 88499fe..10361b7 100644 --- a/src/gui/res/lang/gui_hu-HU.qm +++ b/src/gui/res/lang/gui_hu-HU.qm diff --git a/src/gui/res/lang/gui_hu-HU.ts b/src/gui/res/lang/gui_hu-HU.ts index 524c013..7c26d46 100644 --- a/src/gui/res/lang/gui_hu-HU.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="finished">Alkalmaz</translation> </message> <message> diff --git a/src/gui/res/lang/gui_id.qm b/src/gui/res/lang/gui_id.qm Binary files differindex 2394cf7..74f4117 100644 --- a/src/gui/res/lang/gui_id.qm +++ b/src/gui/res/lang/gui_id.qm diff --git a/src/gui/res/lang/gui_id.ts b/src/gui/res/lang/gui_id.ts index fc2cd9e..ed52252 100644 --- a/src/gui/res/lang/gui_id.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/gui/res/lang/gui_is-IS.qm b/src/gui/res/lang/gui_is-IS.qm Binary files differindex be651ee..0126ff8 100644 --- a/src/gui/res/lang/gui_is-IS.qm +++ b/src/gui/res/lang/gui_is-IS.qm diff --git a/src/gui/res/lang/gui_is-IS.ts b/src/gui/res/lang/gui_is-IS.ts index a4c0aa7..2764171 100644 --- a/src/gui/res/lang/gui_is-IS.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/gui/res/lang/gui_it.qm b/src/gui/res/lang/gui_it.qm Binary files differindex 6153507..bc8dc7e 100644 --- a/src/gui/res/lang/gui_it.qm +++ b/src/gui/res/lang/gui_it.qm diff --git a/src/gui/res/lang/gui_it.ts b/src/gui/res/lang/gui_it.ts index a802e28..c1096dd 100644 --- a/src/gui/res/lang/gui_it.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="finished">Applica</translation> </message> <message> diff --git a/src/gui/res/lang/gui_ja-JP.qm b/src/gui/res/lang/gui_ja-JP.qm Binary files differindex 6310eae..90ff995 100644 --- a/src/gui/res/lang/gui_ja-JP.qm +++ b/src/gui/res/lang/gui_ja-JP.qm diff --git a/src/gui/res/lang/gui_ja-JP.ts b/src/gui/res/lang/gui_ja-JP.ts index c4c0e9e..e7ff5bd 100644 --- a/src/gui/res/lang/gui_ja-JP.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="finished">適用</translation> </message> <message> diff --git a/src/gui/res/lang/gui_ko.qm b/src/gui/res/lang/gui_ko.qm Binary files differindex d29f456..06612cb 100644 --- a/src/gui/res/lang/gui_ko.qm +++ b/src/gui/res/lang/gui_ko.qm diff --git a/src/gui/res/lang/gui_ko.ts b/src/gui/res/lang/gui_ko.ts index fee6276..8c477fc 100644 --- a/src/gui/res/lang/gui_ko.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="finished">적용(&A)</translation> </message> <message> diff --git a/src/gui/res/lang/gui_lt.qm b/src/gui/res/lang/gui_lt.qm Binary files differindex 10a7a05..1aa40d9 100644 --- a/src/gui/res/lang/gui_lt.qm +++ b/src/gui/res/lang/gui_lt.qm diff --git a/src/gui/res/lang/gui_lt.ts b/src/gui/res/lang/gui_lt.ts index 45713fb..66976b1 100644 --- a/src/gui/res/lang/gui_lt.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/gui/res/lang/gui_lv.qm b/src/gui/res/lang/gui_lv.qm Binary files differindex 908d8c4..655b16b 100644 --- a/src/gui/res/lang/gui_lv.qm +++ b/src/gui/res/lang/gui_lv.qm diff --git a/src/gui/res/lang/gui_lv.ts b/src/gui/res/lang/gui_lv.ts index e53cf7d..27b74f0 100644 --- a/src/gui/res/lang/gui_lv.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/gui/res/lang/gui_mr.qm b/src/gui/res/lang/gui_mr.qm Binary files differindex 6b0c47d..f6d5de8 100644 --- a/src/gui/res/lang/gui_mr.qm +++ b/src/gui/res/lang/gui_mr.qm diff --git a/src/gui/res/lang/gui_mr.ts b/src/gui/res/lang/gui_mr.ts index 028005d..b91bd19 100644 --- a/src/gui/res/lang/gui_mr.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/gui/res/lang/gui_nl-NL.qm b/src/gui/res/lang/gui_nl-NL.qm Binary files differindex b467c66..102cec8 100644 --- a/src/gui/res/lang/gui_nl-NL.qm +++ b/src/gui/res/lang/gui_nl-NL.qm diff --git a/src/gui/res/lang/gui_nl-NL.ts b/src/gui/res/lang/gui_nl-NL.ts index 2eabfbb..5c5b490 100644 --- a/src/gui/res/lang/gui_nl-NL.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="finished">Toep&assen</translation> </message> <message> diff --git a/src/gui/res/lang/gui_no.qm b/src/gui/res/lang/gui_no.qm Binary files differindex 6ebf434..903ae48 100644 --- a/src/gui/res/lang/gui_no.qm +++ b/src/gui/res/lang/gui_no.qm diff --git a/src/gui/res/lang/gui_no.ts b/src/gui/res/lang/gui_no.ts index 42d5b95..d27a620 100644 --- a/src/gui/res/lang/gui_no.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="finished">&Bruk</translation> </message> <message> diff --git a/src/gui/res/lang/gui_pes-IR.ts b/src/gui/res/lang/gui_pes-IR.ts index d4a0f91..31d7a67 100644 --- a/src/gui/res/lang/gui_pes-IR.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/gui/res/lang/gui_pl-PL.qm b/src/gui/res/lang/gui_pl-PL.qm Binary files differindex 4b024ad..83e7352 100644 --- a/src/gui/res/lang/gui_pl-PL.qm +++ b/src/gui/res/lang/gui_pl-PL.qm diff --git a/src/gui/res/lang/gui_pl-PL.ts b/src/gui/res/lang/gui_pl-PL.ts index 9fef7f3..6fb96a0 100644 --- a/src/gui/res/lang/gui_pl-PL.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="finished">&Zastosuj</translation> </message> <message> diff --git a/src/gui/res/lang/gui_pt-BR.qm b/src/gui/res/lang/gui_pt-BR.qm Binary files differindex d335d9e..1deecfd 100644 --- a/src/gui/res/lang/gui_pt-BR.qm +++ b/src/gui/res/lang/gui_pt-BR.qm diff --git a/src/gui/res/lang/gui_pt-BR.ts b/src/gui/res/lang/gui_pt-BR.ts index 802551b..6245bca 100644 --- a/src/gui/res/lang/gui_pt-BR.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="finished">Aplicar</translation> </message> <message> diff --git a/src/gui/res/lang/gui_pt-PT.qm b/src/gui/res/lang/gui_pt-PT.qm Binary files differindex cda99e1..987d8ab 100644 --- a/src/gui/res/lang/gui_pt-PT.qm +++ b/src/gui/res/lang/gui_pt-PT.qm diff --git a/src/gui/res/lang/gui_pt-PT.ts b/src/gui/res/lang/gui_pt-PT.ts index 45a20a8..03fc40d 100644 --- a/src/gui/res/lang/gui_pt-PT.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="finished">&Aplicar</translation> </message> <message> diff --git a/src/gui/res/lang/gui_ro.qm b/src/gui/res/lang/gui_ro.qm Binary files differindex 3e71663..6d1fdd2 100644 --- a/src/gui/res/lang/gui_ro.qm +++ b/src/gui/res/lang/gui_ro.qm diff --git a/src/gui/res/lang/gui_ro.ts b/src/gui/res/lang/gui_ro.ts index e79e83b..f82d128 100644 --- a/src/gui/res/lang/gui_ro.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="finished">Aplică</translation> </message> <message> diff --git a/src/gui/res/lang/gui_ru.qm b/src/gui/res/lang/gui_ru.qm Binary files differindex 8ab5f1a..30ed0a7 100644 --- a/src/gui/res/lang/gui_ru.qm +++ b/src/gui/res/lang/gui_ru.qm diff --git a/src/gui/res/lang/gui_ru.ts b/src/gui/res/lang/gui_ru.ts index 08cc4cb..411272f 100644 --- a/src/gui/res/lang/gui_ru.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="finished">&Применить</translation> </message> <message> diff --git a/src/gui/res/lang/gui_si.qm b/src/gui/res/lang/gui_si.qm Binary files differindex 17ba794..f5c8824 100644 --- a/src/gui/res/lang/gui_si.qm +++ b/src/gui/res/lang/gui_si.qm diff --git a/src/gui/res/lang/gui_si.ts b/src/gui/res/lang/gui_si.ts index cb56677..33597e9 100644 --- a/src/gui/res/lang/gui_si.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/gui/res/lang/gui_sk-SK.qm b/src/gui/res/lang/gui_sk-SK.qm Binary files differindex b2abe68..acdf4f6 100644 --- a/src/gui/res/lang/gui_sk-SK.qm +++ b/src/gui/res/lang/gui_sk-SK.qm diff --git a/src/gui/res/lang/gui_sk-SK.ts b/src/gui/res/lang/gui_sk-SK.ts index aac1379..3e63795 100644 --- a/src/gui/res/lang/gui_sk-SK.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/gui/res/lang/gui_sl-SI.qm b/src/gui/res/lang/gui_sl-SI.qm Binary files differindex 4c5ae79..29919fa 100644 --- a/src/gui/res/lang/gui_sl-SI.qm +++ b/src/gui/res/lang/gui_sl-SI.qm diff --git a/src/gui/res/lang/gui_sl-SI.ts b/src/gui/res/lang/gui_sl-SI.ts index 2d4a49d..5aa6cde 100644 --- a/src/gui/res/lang/gui_sl-SI.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/gui/res/lang/gui_sq-AL.qm b/src/gui/res/lang/gui_sq-AL.qm Binary files differindex 2de4bb7..c80f8ab 100644 --- a/src/gui/res/lang/gui_sq-AL.qm +++ b/src/gui/res/lang/gui_sq-AL.qm diff --git a/src/gui/res/lang/gui_sq-AL.ts b/src/gui/res/lang/gui_sq-AL.ts index 980b795..1fcd217 100644 --- a/src/gui/res/lang/gui_sq-AL.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="finished">&Apliko</translation> </message> <message> diff --git a/src/gui/res/lang/gui_sr.ts b/src/gui/res/lang/gui_sr.ts index f245475..4ae87d8 100644 --- a/src/gui/res/lang/gui_sr.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/gui/res/lang/gui_sv.qm b/src/gui/res/lang/gui_sv.qm Binary files differindex c5fb93b..f014cfd 100644 --- a/src/gui/res/lang/gui_sv.qm +++ b/src/gui/res/lang/gui_sv.qm diff --git a/src/gui/res/lang/gui_sv.ts b/src/gui/res/lang/gui_sv.ts index 8494970..6a8420e 100644 --- a/src/gui/res/lang/gui_sv.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="finished">Verkställ</translation> </message> <message> diff --git a/src/gui/res/lang/gui_th-TH.qm b/src/gui/res/lang/gui_th-TH.qm Binary files differindex 3762d16..77a70dc 100644 --- a/src/gui/res/lang/gui_th-TH.qm +++ b/src/gui/res/lang/gui_th-TH.qm diff --git a/src/gui/res/lang/gui_th-TH.ts b/src/gui/res/lang/gui_th-TH.ts index 878a4e3..07c74b8 100644 --- a/src/gui/res/lang/gui_th-TH.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/gui/res/lang/gui_tr-TR.qm b/src/gui/res/lang/gui_tr-TR.qm Binary files differindex 55ef0f8..14b3df6 100644 --- a/src/gui/res/lang/gui_tr-TR.qm +++ b/src/gui/res/lang/gui_tr-TR.qm diff --git a/src/gui/res/lang/gui_tr-TR.ts b/src/gui/res/lang/gui_tr-TR.ts index d35de14..01a681b 100644 --- a/src/gui/res/lang/gui_tr-TR.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="finished">Uygula</translation> </message> <message> diff --git a/src/gui/res/lang/gui_uk.qm b/src/gui/res/lang/gui_uk.qm Binary files differindex 275a454..3e9c9c5 100644 --- a/src/gui/res/lang/gui_uk.qm +++ b/src/gui/res/lang/gui_uk.qm diff --git a/src/gui/res/lang/gui_uk.ts b/src/gui/res/lang/gui_uk.ts index 68cac01..1f2dffe 100644 --- a/src/gui/res/lang/gui_uk.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="finished">Застосувати</translation> </message> <message> diff --git a/src/gui/res/lang/gui_ur.qm b/src/gui/res/lang/gui_ur.qm Binary files differindex c546613..0b364dd 100644 --- a/src/gui/res/lang/gui_ur.qm +++ b/src/gui/res/lang/gui_ur.qm diff --git a/src/gui/res/lang/gui_ur.ts b/src/gui/res/lang/gui_ur.ts index 2dbd1ea..9b36dcf 100644 --- a/src/gui/res/lang/gui_ur.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/gui/res/lang/gui_vi.qm b/src/gui/res/lang/gui_vi.qm Binary files differindex 12ce570..879b157 100644 --- a/src/gui/res/lang/gui_vi.qm +++ b/src/gui/res/lang/gui_vi.qm diff --git a/src/gui/res/lang/gui_vi.ts b/src/gui/res/lang/gui_vi.ts index e4031c5..a3c6025 100644 --- a/src/gui/res/lang/gui_vi.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/gui/res/lang/gui_zh-CN.qm b/src/gui/res/lang/gui_zh-CN.qm Binary files differindex ab5415e..f11d0b5 100644 --- a/src/gui/res/lang/gui_zh-CN.qm +++ b/src/gui/res/lang/gui_zh-CN.qm diff --git a/src/gui/res/lang/gui_zh-CN.ts b/src/gui/res/lang/gui_zh-CN.ts index b5cdf6c..0c8522a 100644 --- a/src/gui/res/lang/gui_zh-CN.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="finished">应用</translation> </message> <message> diff --git a/src/gui/res/lang/gui_zh-TW.qm b/src/gui/res/lang/gui_zh-TW.qm Binary files differindex 92e5e3a..5cc8653 100644 --- a/src/gui/res/lang/gui_zh-TW.qm +++ b/src/gui/res/lang/gui_zh-TW.qm diff --git a/src/gui/res/lang/gui_zh-TW.ts b/src/gui/res/lang/gui_zh-TW.ts index fc55f56..902a444 100644 --- a/src/gui/res/lang/gui_zh-TW.ts +++ b/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>&Apply</source> + <source>&Reload</source> <translation type="finished">應用</translation> </message> <message> diff --git a/src/gui/src/BaseConfig.cpp b/src/gui/src/BaseConfig.cpp index 36fe430..241f590 100644 --- a/src/gui/src/BaseConfig.cpp +++ b/src/gui/src/BaseConfig.cpp @@ -33,7 +33,8 @@ const char* BaseConfig::m_FixNames[] = "halfDuplexCapsLock", "halfDuplexNumLock", "halfDuplexScrollLock", - "xtestIsXineramaUnaware" + "xtestIsXineramaUnaware", + "preserveFocus" }; const char* BaseConfig::m_SwitchCornerNames[] = diff --git a/src/gui/src/BaseConfig.h b/src/gui/src/BaseConfig.h index f1769bb..2a34969 100644 --- a/src/gui/src/BaseConfig.h +++ b/src/gui/src/BaseConfig.h @@ -29,7 +29,7 @@ class BaseConfig public: enum Modifier { DefaultMod = -1, Shift, Ctrl, Alt, Meta, Super, None, NumModifiers }; enum SwitchCorner { TopLeft, TopRight, BottomLeft, BottomRight, NumSwitchCorners }; - enum Fix { CapsLock, NumLock, ScrollLock, XTest, NumFixes }; + enum Fix { CapsLock, NumLock, ScrollLock, XTest, PreserveFocus, NumFixes }; protected: BaseConfig() {} diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp index 6829c22..bcbb15b 100644 --- a/src/gui/src/MainWindow.cpp +++ b/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(); } diff --git a/src/gui/src/MainWindow.h b/src/gui/src/MainWindow.h index 5bb2895..c115b91 100644 --- a/src/gui/src/MainWindow.h +++ b/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(); }; diff --git a/src/gui/src/MainWindowBase.ui b/src/gui/src/MainWindowBase.ui index d1b0b37..117405c 100644 --- a/src/gui/src/MainWindowBase.ui +++ b/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>&Apply</string> + <string>&Reload</string> </property> </widget> </item> diff --git a/src/gui/src/ScreenSettingsDialog.cpp b/src/gui/src/ScreenSettingsDialog.cpp index 4f294e2..3023b6d 100644 --- a/src/gui/src/ScreenSettingsDialog.cpp +++ b/src/gui/src/ScreenSettingsDialog.cpp @@ -68,6 +68,7 @@ ScreenSettingsDialog::ScreenSettingsDialog(QWidget* parent, Screen* pScreen) : m_pCheckBoxNumLock->setChecked(m_pScreen->fix(Screen::NumLock)); m_pCheckBoxScrollLock->setChecked(m_pScreen->fix(Screen::ScrollLock)); m_pCheckBoxXTest->setChecked(m_pScreen->fix(Screen::XTest)); + m_pCheckBoxPreserveFocus->setChecked(m_pScreen->fix(Screen::PreserveFocus)); } void ScreenSettingsDialog::accept() @@ -115,6 +116,7 @@ void ScreenSettingsDialog::accept() m_pScreen->setFix(Screen::NumLock, m_pCheckBoxNumLock->isChecked()); m_pScreen->setFix(Screen::ScrollLock, m_pCheckBoxScrollLock->isChecked()); m_pScreen->setFix(Screen::XTest, m_pCheckBoxXTest->isChecked()); + m_pScreen->setFix(Screen::PreserveFocus, m_pCheckBoxPreserveFocus->isChecked()); QDialog::accept(); } diff --git a/src/gui/src/ScreenSettingsDialogBase.ui b/src/gui/src/ScreenSettingsDialogBase.ui index 0d6d768..992919d 100644 --- a/src/gui/src/ScreenSettingsDialogBase.ui +++ b/src/gui/src/ScreenSettingsDialogBase.ui @@ -462,7 +462,17 @@ </property> </widget> </item> - <item row="4" column="0"> + <item row="4" column="0"> + <widget class="QCheckBox" name="m_pCheckBoxPreserveFocus"> + <property name="text"> + <string>Fix Preserve Focus</string> + </property> + <property name="checked"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="5" column="0"> <spacer> <property name="orientation"> <enum>Qt::Vertical</enum> diff --git a/src/gui/src/ServerConfig.cpp b/src/gui/src/ServerConfig.cpp index 6c19c0e..d7d1a77 100644 --- a/src/gui/src/ServerConfig.cpp +++ b/src/gui/src/ServerConfig.cpp @@ -117,6 +117,7 @@ void ServerConfig::saveSettings() settings().setValue("switchCornerSize", switchCornerSize()); settings().setValue("ignoreAutoConfigClient", ignoreAutoConfigClient()); settings().setValue("enableDragAndDrop", enableDragAndDrop()); + settings().setValue("clipboardSharing", clipboardSharing()); writeSettings(settings(), switchCorners(), "switchCorner"); @@ -161,6 +162,7 @@ void ServerConfig::loadSettings() setSwitchCornerSize(settings().value("switchCornerSize").toInt()); setIgnoreAutoConfigClient(settings().value("ignoreAutoConfigClient").toBool()); setEnableDragAndDrop(settings().value("enableDragAndDrop", true).toBool()); + setClipboardSharing(settings().value("clipboardSharing", true).toBool()); readSettings(settings(), switchCorners(), "switchCorner", false, NumSwitchCorners); diff --git a/src/gui/src/main.cpp b/src/gui/src/main.cpp index 76a7d1a..73251d5 100644 --- a/src/gui/src/main.cpp +++ b/src/gui/src/main.cpp @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#define TRAY_RETRY_COUNT 10 +#define TRAY_RETRY_COUNT 5 #define TRAY_RETRY_WAIT 2000 #include "QBarrierApplication.h" @@ -74,8 +74,13 @@ int main(int argc, char* argv[]) QBarrierApplication app(argc, argv); #if defined(Q_OS_MAC) - if (app.applicationDirPath().startsWith("/Volumes/")) { + // macOS preferences track applications allowed assistive access by path + // Unfortunately, there's no user-friendly way to allow assistive access + // to applications that are not in default paths (/Applications), + // especially if an identically named application already exists in + // /Applications). Thus we require Barrier to reside in the /Applications + // folder QMessageBox::information( NULL, "Barrier", "Please drag Barrier to the Applications folder, and open it from there."); @@ -88,16 +93,20 @@ int main(int argc, char* argv[]) } #endif - if (!waitForTray()) - { - return -1; - } + int trayAvailable = waitForTray(); QApplication::setQuitOnLastWindowClosed(false); QSettings settings; AppConfig appConfig (&settings); + if (appConfig.getAutoHide() && !trayAvailable) + { + // force auto hide to false - otherwise there is no way to get the GUI back + fprintf(stdout, "System tray not available, force disabling auto hide!\n"); + appConfig.setAutoHide(false); + } + app.switchTranslator(appConfig.language()); MainWindow mainWindow(settings, appConfig); @@ -129,9 +138,8 @@ int waitForTray() if (++trayAttempts > TRAY_RETRY_COUNT) { - QMessageBox::critical(NULL, "Barrier", - QObject::tr("System tray is unavailable, don't close your window.")); - return true; + fprintf(stdout, "System tray is unavailable.\n"); + return false; } QThreadImpl::msleep(TRAY_RETRY_WAIT); |