From 1327801ec44357348e87187bc675380be277411c Mon Sep 17 00:00:00 2001 From: Ashkan Date: Tue, 22 Oct 2019 11:20:54 +0200 Subject: [PATCH 01/20] New translations messages.pot (Italian) --- translations/i18n/it.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/translations/i18n/it.po b/translations/i18n/it.po index d6dc54895f..950edf5191 100644 --- a/translations/i18n/it.po +++ b/translations/i18n/it.po @@ -10,7 +10,7 @@ msgstr "" "Last-Translator: binarycom\n" "Language-Team: Italian\n" "Language: it_IT\n" -"PO-Revision-Date: 2019-10-18 12:51\n" +"PO-Revision-Date: 2019-10-22 09:20\n" msgid "\"http://www.gamblingcommission.gov.uk/Consumers/Protection-of-customer-funds.aspx\"" msgstr "\"http://www.gamblingcommission.gov.uk/Consumers/Protection-of-customer-funds.aspx\"" @@ -1243,7 +1243,7 @@ msgid "Please enter a value greater than 0" msgstr "Inserire un valore superiore a 0" msgid "Please enter a value less than 6 weeks for time out until." -msgstr "Inserisci un valore inferiore alle 6 settimane per il limite di tempo." +msgstr "Inserisci un valore inferiore alle 6 settimane per il periodo di esclusione." msgid "Please enter date in the format YYYY-MM-DD" msgstr "Inserisci la data nel formato AAAA-MM-GG" @@ -1360,7 +1360,7 @@ msgid "Reality check" msgstr "Monitoraggio della situazione" msgid "Redirecting to oauth login page," -msgstr "Ti stiamo reindirizzando a una pagina di login OAuth" +msgstr "Ti stiamo reindirizzando a una pagina di login OAuth," msgid "Ref" msgstr "Rif" From 9691652e87ebb0c84c2f4d7af6c149ca2f757aa3 Mon Sep 17 00:00:00 2001 From: Ashkan Date: Tue, 22 Oct 2019 11:31:02 +0200 Subject: [PATCH 02/20] New translations messages.pot (Italian) --- translations/i18n/it.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/translations/i18n/it.po b/translations/i18n/it.po index 950edf5191..b2d9b85c6e 100644 --- a/translations/i18n/it.po +++ b/translations/i18n/it.po @@ -10,7 +10,7 @@ msgstr "" "Last-Translator: binarycom\n" "Language-Team: Italian\n" "Language: it_IT\n" -"PO-Revision-Date: 2019-10-22 09:20\n" +"PO-Revision-Date: 2019-10-22 09:30\n" msgid "\"http://www.gamblingcommission.gov.uk/Consumers/Protection-of-customer-funds.aspx\"" msgstr "\"http://www.gamblingcommission.gov.uk/Consumers/Protection-of-customer-funds.aspx\"" @@ -1498,7 +1498,7 @@ msgid "Some random index" msgstr "Indici casuali" msgid "Spline" -msgstr "Spline" +msgstr "Grafico spline" msgid "Spreads" msgstr "Spread" @@ -1672,13 +1672,13 @@ msgid "To deposit money please contact the payment agent directly" msgstr "Per depositare fondi, contatta direttamente l'agente di pagamento" msgid "To find out more and to sign up with GAMSTOP, please visit" -msgstr "Per saperne di più e per iscriverti con GAMSTOP, visita il sito" +msgstr "Per ulteriori informazioni e per iscriversi a GAMSTOP, visita il sito" msgid "To process deposits and withdrawals for payment methods or local currencies not supported by Binary.com contact a payment agent" -msgstr "Per elaborare i depositi e i prelievi per le modalità di pagamento o valute locali non supportate da Binary.com, contatta un agente di pagamento" +msgstr "Per effettuare depositi e prelievi con modalità di pagamento o valute locali non supportate da Binary.com, contatta un agente di pagamento" msgid "To self-exclude from all online gambling companies licensed in Great Britain, you may go to" -msgstr "Per autoescludersi da qualsiasi società di gioco d'azzardo online autorizzata in Gran Bretagna, aprire il link seguente" +msgstr "Per auto-escludersi da qualsiasi società di gioco d'azzardo online autorizzata in Gran Bretagna, visita il sito" msgid "To withdraw funds please enter the special verification token we have just emailed you" msgstr "Per prelevare fondi, inserisci lo speciale token di verifica che ti abbiamo appena inviato tramite email" From fe9f94322f379b32718d5a32d622776a2eddd791 Mon Sep 17 00:00:00 2001 From: Ashkan Date: Tue, 22 Oct 2019 11:41:22 +0200 Subject: [PATCH 03/20] New translations messages.pot (Italian) --- translations/i18n/it.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/translations/i18n/it.po b/translations/i18n/it.po index b2d9b85c6e..58d7c311eb 100644 --- a/translations/i18n/it.po +++ b/translations/i18n/it.po @@ -10,7 +10,7 @@ msgstr "" "Last-Translator: binarycom\n" "Language-Team: Italian\n" "Language: it_IT\n" -"PO-Revision-Date: 2019-10-22 09:30\n" +"PO-Revision-Date: 2019-10-22 09:41\n" msgid "\"http://www.gamblingcommission.gov.uk/Consumers/Protection-of-customer-funds.aspx\"" msgstr "\"http://www.gamblingcommission.gov.uk/Consumers/Protection-of-customer-funds.aspx\"" @@ -1717,28 +1717,28 @@ msgid "Token permissions" msgstr "Autorizzazioni dei token" msgid "Tooltip background" -msgstr "Sfondo della tooltip" +msgstr "Sfondo del tooltip" msgid "Tooltip text" -msgstr "Testo nella tooltip" +msgstr "Testo del tooltip" msgid "Total Copiers" -msgstr "Fotocopiatrici totali" +msgstr "Repliche totali" msgid "Total Cost" msgstr "Costo totale" msgid "Total Profit/Loss" -msgstr "Profitto/Perdita totale" +msgstr "Profitto/perdita totale" msgid "Total Trades" msgstr "Trade totali" msgid "Touch" -msgstr "Touch" +msgstr "Tocca" msgid "Touch/No Touch" -msgstr "Touch/No Touch" +msgstr "Tocca/Non tocca" msgid "Tourism" msgstr "Turismo" From 149a46609cefbcea736453e63774c3cad221e6f5 Mon Sep 17 00:00:00 2001 From: Ashkan Date: Tue, 22 Oct 2019 11:50:59 +0200 Subject: [PATCH 04/20] New translations messages.pot (Italian) --- translations/i18n/it.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/translations/i18n/it.po b/translations/i18n/it.po index 58d7c311eb..ad7e5e3cfc 100644 --- a/translations/i18n/it.po +++ b/translations/i18n/it.po @@ -10,7 +10,7 @@ msgstr "" "Last-Translator: binarycom\n" "Language-Team: Italian\n" "Language: it_IT\n" -"PO-Revision-Date: 2019-10-22 09:41\n" +"PO-Revision-Date: 2019-10-22 09:50\n" msgid "\"http://www.gamblingcommission.gov.uk/Consumers/Protection-of-customer-funds.aspx\"" msgstr "\"http://www.gamblingcommission.gov.uk/Consumers/Protection-of-customer-funds.aspx\"" @@ -889,7 +889,7 @@ msgid "Line" msgstr "Linea" msgid "Line Dot" -msgstr "Punto linea" +msgstr "Linea punteggiata" msgid "Link" msgstr "Link" @@ -1768,7 +1768,7 @@ msgid "Trading Times" msgstr "Orari di trading" msgid "Trading binary options may not be suitable for everyone, so please ensure that you fully understand the risks involved. Your losses can exceed your initial deposit and you do not own or have any interest in the underlying asset." -msgstr "Il trading di opzioni binarie può non essere adatto a tutti, pertanto occorre assicurarsi di aver compreso appieno i rischi connessi. Le perdite possono superare il deposito iniziale, e il Cliente non è effettivamente in possesso degli asset sottostanti, né ha degli interessi su di essi." +msgstr "Il trading di opzioni binarie potrebbe non essere adatto a tutti, pertanto occorre assicurarsi di aver compreso appieno i rischi connessi. Le perdite possono superare il deposito iniziale e il cliente non possiede l'asset sottostante né detiene interessi su di esso." msgid "Tradingview for Binary.com" msgstr "Tradingview per Binary.com" @@ -1777,7 +1777,7 @@ msgid "Transfer" msgstr "Trasferisci" msgid "Transfer to another Binary account" -msgstr "Trasferisci a un altro account Binary" +msgstr "Trasferisci a un altro conto Binary" msgid "Try" msgstr "Prova" @@ -1789,7 +1789,7 @@ msgid "Tuesday" msgstr "Martedì" msgid "Turnover" -msgstr "Turnover" +msgstr "Volume dei trade" msgid "USD" msgstr "USD" From 886f3c7072b2b1cf96147fc177ff6ff954687c14 Mon Sep 17 00:00:00 2001 From: Ashkan Date: Wed, 30 Oct 2019 16:24:55 +0100 Subject: [PATCH 05/20] New translations messages.pot (Italian) --- translations/i18n/it.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/translations/i18n/it.po b/translations/i18n/it.po index ad7e5e3cfc..259012dac4 100644 --- a/translations/i18n/it.po +++ b/translations/i18n/it.po @@ -10,7 +10,7 @@ msgstr "" "Last-Translator: binarycom\n" "Language-Team: Italian\n" "Language: it_IT\n" -"PO-Revision-Date: 2019-10-22 09:50\n" +"PO-Revision-Date: 2019-10-30 15:24\n" msgid "\"http://www.gamblingcommission.gov.uk/Consumers/Protection-of-customer-funds.aspx\"" msgstr "\"http://www.gamblingcommission.gov.uk/Consumers/Protection-of-customer-funds.aspx\"" @@ -1801,13 +1801,13 @@ msgid "Under" msgstr "Sotto" msgid "Unfortunately, your browser does not support them" -msgstr "Purtroppo il tuo browser non li supporta" +msgstr "Sfortunatamente il tuo browser non li supporta" msgid "Up/Down" msgstr "Up/Down" msgid "Upcoming Events" -msgstr "Eventi in arrivo" +msgstr "Eventi in programma" msgid "Update" msgstr "Aggiorna" @@ -1816,7 +1816,7 @@ msgid "Update Settings" msgstr "Aggiorna impostazioni" msgid "Upgrade to a Real Account" -msgstr "Passa a un account vero" +msgstr "Passa a un conto reale" msgid "Upload template" msgstr "Carica modello" @@ -1840,16 +1840,16 @@ msgid "Verification token" msgstr "Token di verifica" msgid "Verify new password" -msgstr "Verifica nuova password" +msgstr "Verifica la nuova password" msgid "Vertical line" msgstr "Linea verticale" msgid "View" -msgstr "Mostra" +msgstr "Visualizza" msgid "View Statement" -msgstr "Mostra l'estratto" +msgstr "Visualizza l'estratto" msgid "Volatility Indicators" msgstr "Indicatori di volatilità" @@ -1879,7 +1879,7 @@ msgid "When you click \"Ok\" you will be excluded from trading on the site until msgstr "Cliccando su \"Ok\" verrai escluso dal trading sul sito fino alla data selezionata." msgid "While on the go, you can" -msgstr "Mentre sei in movimento, puoi" +msgstr "Ovunque ti trovi, potrai" msgid "Withdraw funds" msgstr "Preleva fondi" @@ -2071,7 +2071,7 @@ msgid "points" msgstr "punti" msgid "risk warning" -msgstr "avviso di rischio" +msgstr "Avvertenza sul rischio" msgid "sec" msgstr "sec" From b0595074107e30d9abcabfbcfac5babe3780eb0d Mon Sep 17 00:00:00 2001 From: Ashkan Date: Tue, 5 Nov 2019 10:21:21 +0100 Subject: [PATCH 06/20] New translations messages.pot (Italian) --- translations/i18n/it.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translations/i18n/it.po b/translations/i18n/it.po index 259012dac4..c9a765a19d 100644 --- a/translations/i18n/it.po +++ b/translations/i18n/it.po @@ -10,7 +10,7 @@ msgstr "" "Last-Translator: binarycom\n" "Language-Team: Italian\n" "Language: it_IT\n" -"PO-Revision-Date: 2019-10-30 15:24\n" +"PO-Revision-Date: 2019-11-05 09:21\n" msgid "\"http://www.gamblingcommission.gov.uk/Consumers/Protection-of-customer-funds.aspx\"" msgstr "\"http://www.gamblingcommission.gov.uk/Consumers/Protection-of-customer-funds.aspx\"" @@ -2002,7 +2002,7 @@ msgid "for" msgstr "per" msgid "for mobile charts" -msgstr "per grafici mobili" +msgstr "per grafici su cellulare" msgid "has updated its" msgstr "ha aggiornato i suoi" From 2f83a253b33b7beeccc99d7828c00e746e6d6545 Mon Sep 17 00:00:00 2001 From: Ashkan Date: Tue, 5 Nov 2019 10:31:03 +0100 Subject: [PATCH 07/20] New translations messages.pot (Italian) --- translations/i18n/it.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/translations/i18n/it.po b/translations/i18n/it.po index c9a765a19d..9e08ea4288 100644 --- a/translations/i18n/it.po +++ b/translations/i18n/it.po @@ -10,7 +10,7 @@ msgstr "" "Last-Translator: binarycom\n" "Language-Team: Italian\n" "Language: it_IT\n" -"PO-Revision-Date: 2019-11-05 09:21\n" +"PO-Revision-Date: 2019-11-05 09:31\n" msgid "\"http://www.gamblingcommission.gov.uk/Consumers/Protection-of-customer-funds.aspx\"" msgstr "\"http://www.gamblingcommission.gov.uk/Consumers/Protection-of-customer-funds.aspx\"" @@ -1954,16 +1954,16 @@ msgid "Your copying settings" msgstr "Le tue impostazioni per la copia" msgid "Your new account balance is" -msgstr "Il saldo del tuo nuovo account è" +msgstr "Il nuovo saldo del conto è" msgid "Your transaction reference is" -msgstr "Il riferimento della tua transazione è" +msgstr "Il riferimento della transazione è" msgid "Your transaction reference number is" -msgstr "Il numero di riferimento della tua transazione è" +msgstr "Il numero di riferimento della transazione è" msgid "Zoom" -msgstr "Zoom" +msgstr "Zoomare" msgid "[_1]Authenticate your account[_2] now to take full advantage of all withdrawal options available." msgstr "[_1]Autentica ora il tuo conto[_2] per accedere a tutte le opzioni di prelievo disponibili." @@ -1975,7 +1975,7 @@ msgid "commission" msgstr "commissione" msgid "create a Read-only token, and share the token with your copier(s)" -msgstr "crea un token di sola lettura e condividi con la/e fotocopiatrice/i" +msgstr "crea un token di sola lettura e condividilo con i trader che ti seguono" msgid "customer support" msgstr "assistenza clienti" @@ -2047,7 +2047,7 @@ msgid "main site" msgstr "sito principale" msgid "market is presently closed." -msgstr "Il mercato è attualmente chiuso." +msgstr "il mercato è chiuso al momento." msgid "medium protection" msgstr "protezione media" From 6c7aa450a811016b9bd2aebc8f6162fdf9fadb1d Mon Sep 17 00:00:00 2001 From: Ashkan Date: Tue, 5 Nov 2019 10:40:39 +0100 Subject: [PATCH 08/20] New translations messages.pot (Italian) --- translations/i18n/it.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translations/i18n/it.po b/translations/i18n/it.po index 9e08ea4288..b92237cb2a 100644 --- a/translations/i18n/it.po +++ b/translations/i18n/it.po @@ -10,7 +10,7 @@ msgstr "" "Last-Translator: binarycom\n" "Language-Team: Italian\n" "Language: it_IT\n" -"PO-Revision-Date: 2019-11-05 09:31\n" +"PO-Revision-Date: 2019-11-05 09:40\n" msgid "\"http://www.gamblingcommission.gov.uk/Consumers/Protection-of-customer-funds.aspx\"" msgstr "\"http://www.gamblingcommission.gov.uk/Consumers/Protection-of-customer-funds.aspx\"" @@ -1927,7 +1927,7 @@ msgid "You pay" msgstr "Paghi" msgid "You will be automatically logged out after such time" -msgstr "Dopo questo tempo, verrai automaticamente loggato" +msgstr "Al termine di tale periodo, verrà automaticamente eseguito il logout" msgid "You wish to allow other traders to copy your trades" msgstr "Vuoi consentire ad altri trader di copiare i tuoi trade" From ecc19e40282b2808a9e82b0b63bcbebf2cc8d174 Mon Sep 17 00:00:00 2001 From: Ashkan Date: Wed, 6 Nov 2019 11:40:24 +0100 Subject: [PATCH 09/20] New translations messages.pot (Italian) --- translations/i18n/it.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/translations/i18n/it.po b/translations/i18n/it.po index b92237cb2a..c9f6ebc618 100644 --- a/translations/i18n/it.po +++ b/translations/i18n/it.po @@ -10,7 +10,7 @@ msgstr "" "Last-Translator: binarycom\n" "Language-Team: Italian\n" "Language: it_IT\n" -"PO-Revision-Date: 2019-11-05 09:40\n" +"PO-Revision-Date: 2019-11-06 10:40\n" msgid "\"http://www.gamblingcommission.gov.uk/Consumers/Protection-of-customer-funds.aspx\"" msgstr "\"http://www.gamblingcommission.gov.uk/Consumers/Protection-of-customer-funds.aspx\"" @@ -1480,7 +1480,7 @@ msgid "Session duration limit, in minutes" msgstr "Limite di durata della sessione, in minuti" msgid "Settles" -msgstr "Depositi" +msgstr "Liquida" msgid "Share" msgstr "Condividi" @@ -1861,7 +1861,7 @@ msgid "Webtrader" msgstr "Webtrader" msgid "Webtrader is an advanced trading platform that's fully-customisable according to your personal preferences" -msgstr "Webtrader è una piattaforma di trading avanzata, totalmente personalizzabile, in base alle tue preferenze personali" +msgstr "Webtrader è una piattaforma di trading avanzata, totalmente personalizzabile in base alle tue preferenze personali" msgid "Webtrader uses new web technologies for rich and enjoyable trading experience" msgstr "Webtrader utilizza nuove tecnologie web per un'esperienza di trading ricca e piacevole" @@ -1936,7 +1936,7 @@ msgid "You wish to copy another trader's trades" msgstr "Desideri copiare i trade di un altro trader" msgid "Your account (%) is locked, please contact customer support for more info." -msgstr "Il tuo account (%) è bloccato. Per ulteriori informazioni, contatta l'assistenza clienti." +msgstr "Il tuo conto (%) è bloccato. Per ulteriori informazioni, contatta l'assistenza clienti." msgid "Your account is restricted. Kindly [_1]contact customer support[_2] for assistance." msgstr "Il tuo conto è sottoposto a limitazioni. [_1]Contatta l'assistenza clienti[_2] per ricevere supporto." @@ -2017,7 +2017,7 @@ msgid "in the future, the" msgstr "nel futuro, il" msgid "is Binary's advanced desktop trading platform. Its multi-window interface provides maximum flexibility and suits the needs of active traders working on their desktop PCs" -msgstr "è la piattaforma di trading avanzata per desktop di Binary. La sua interfaccia fornisce massima flessibilità e si adatta alle esigenze dei trader attivi che lavorano direttamente sui propri PC" +msgstr "è la piattaforma di trading avanzata per desktop di Binary. La sua interfaccia con finestre multiple fornisce massima flessibilità e si adatta alle esigenze dei trader attivi che lavorano direttamente sui propri PC" msgid "is required. Current spread" msgstr "è richiesto. Spread attuale" From 1eae3c59b9eeea4db378f425a40d100597f23faa Mon Sep 17 00:00:00 2001 From: Ashkan Date: Wed, 6 Nov 2019 11:41:07 +0100 Subject: [PATCH 10/20] New translations messages.pot (Italian) --- translations/i18n/it.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translations/i18n/it.po b/translations/i18n/it.po index c9f6ebc618..60643cd404 100644 --- a/translations/i18n/it.po +++ b/translations/i18n/it.po @@ -10,7 +10,7 @@ msgstr "" "Last-Translator: binarycom\n" "Language-Team: Italian\n" "Language: it_IT\n" -"PO-Revision-Date: 2019-11-06 10:40\n" +"PO-Revision-Date: 2019-11-06 10:41\n" msgid "\"http://www.gamblingcommission.gov.uk/Consumers/Protection-of-customer-funds.aspx\"" msgstr "\"http://www.gamblingcommission.gov.uk/Consumers/Protection-of-customer-funds.aspx\"" @@ -1480,7 +1480,7 @@ msgid "Session duration limit, in minutes" msgstr "Limite di durata della sessione, in minuti" msgid "Settles" -msgstr "Liquida" +msgstr "Salda" msgid "Share" msgstr "Condividi" From 00aca8f12c388702d81e5bbb878a8c492fdf1838 Mon Sep 17 00:00:00 2001 From: Ashkan Date: Mon, 11 Nov 2019 16:40:39 +0100 Subject: [PATCH 11/20] New translations messages.pot (Italian) --- translations/i18n/it.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/translations/i18n/it.po b/translations/i18n/it.po index 60643cd404..e07afa5222 100644 --- a/translations/i18n/it.po +++ b/translations/i18n/it.po @@ -10,7 +10,7 @@ msgstr "" "Last-Translator: binarycom\n" "Language-Team: Italian\n" "Language: it_IT\n" -"PO-Revision-Date: 2019-11-06 10:41\n" +"PO-Revision-Date: 2019-11-11 15:40\n" msgid "\"http://www.gamblingcommission.gov.uk/Consumers/Protection-of-customer-funds.aspx\"" msgstr "\"http://www.gamblingcommission.gov.uk/Consumers/Protection-of-customer-funds.aspx\"" @@ -1804,7 +1804,7 @@ msgid "Unfortunately, your browser does not support them" msgstr "Sfortunatamente il tuo browser non li supporta" msgid "Up/Down" -msgstr "Up/Down" +msgstr "Alto/Basso" msgid "Upcoming Events" msgstr "Eventi in programma" @@ -1825,7 +1825,7 @@ msgid "Use" msgstr "Usa" msgid "Use the \"Save as ...\" button to save the chart settings, type, time period, indicators and comparisons" -msgstr "Usa il pulsante \"Salva come...\" per salvare le impostazioni del grafico, tipologia, periodo di tempo, indicatori e confronti" +msgstr "Usa il pulsante \"Salva come...\" per salvare le impostazioni del grafico, la tipologia, il periodo di tempo, gli indicatori e i confronti" msgid "Use the \"Save as ...\" button to save the trade settings" msgstr "Usa il pulsante \"Salva come...\" per salvare le impostazioni del trade" @@ -1855,7 +1855,7 @@ msgid "Volatility Indicators" msgstr "Indicatori di volatilità" msgid "We are required by our license to inform you about what happens to funds which we hold on account for you, and the extent to which funds are protected in the event of insolvency" -msgstr "In base alla nostra autorizzazione, siamo tenuti a informarti su cosa succede ai fondi che teniamo per tuo conto e sul livello di protezione dei fondi in caso di insolvenza" +msgstr "In base alla nostra autorizzazione, siamo tenuti a informarti di cosa succede ai fondi che deteniamo per tuo conto e sul livello di protezione degli stessi in caso di insolvenza" msgid "Webtrader" msgstr "Webtrader" From 64329d93db998a63957ab4d9a3d207378ea35c3c Mon Sep 17 00:00:00 2001 From: Ashkan Date: Mon, 11 Nov 2019 16:51:15 +0100 Subject: [PATCH 12/20] New translations messages.pot (Italian) --- translations/i18n/it.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translations/i18n/it.po b/translations/i18n/it.po index e07afa5222..bc2e28a928 100644 --- a/translations/i18n/it.po +++ b/translations/i18n/it.po @@ -10,7 +10,7 @@ msgstr "" "Last-Translator: binarycom\n" "Language-Team: Italian\n" "Language: it_IT\n" -"PO-Revision-Date: 2019-11-11 15:40\n" +"PO-Revision-Date: 2019-11-11 15:51\n" msgid "\"http://www.gamblingcommission.gov.uk/Consumers/Protection-of-customer-funds.aspx\"" msgstr "\"http://www.gamblingcommission.gov.uk/Consumers/Protection-of-customer-funds.aspx\"" @@ -1831,7 +1831,7 @@ msgid "Use the \"Save as ...\" button to save the trade settings" msgstr "Usa il pulsante \"Salva come...\" per salvare le impostazioni del trade" msgid "Various customisable features like loading and arranging assets, charting, and other resources however you see fit" -msgstr "Varie caratteristiche come il caricamento e la disposizione degli asset, la creazione di grafici e altre risorse personalizzabili in base alle tue preferenze" +msgstr "Diverse funzioni personalizzabili in base alle tue preferenze come il caricamento e la disposizione degli asset, la creazione di grafici e altre risorse" msgid "Verification code sent to" msgstr "Codice di verifica inviato a" From e44c3b0e3916d8f63c942b759bca72cb6f277410 Mon Sep 17 00:00:00 2001 From: oskar-binary Date: Fri, 15 Nov 2019 11:23:47 +0800 Subject: [PATCH 13/20] add meta referrer tag --- src/index.html | 1 + src/main.html | 1 + 2 files changed, 2 insertions(+) diff --git a/src/index.html b/src/index.html index 58c8359ddd..8e1e26c94f 100755 --- a/src/index.html +++ b/src/index.html @@ -9,6 +9,7 @@ + Binary.com : Webtrader diff --git a/src/main.html b/src/main.html index 7cdff69414..37b2cef1d1 100755 --- a/src/main.html +++ b/src/main.html @@ -6,6 +6,7 @@ + Binary.com : Webtrader From 712bbae1428cc1e8289393cf2fcb8d9176b855e8 Mon Sep 17 00:00:00 2001 From: Apoorv Joshi Date: Thu, 21 Nov 2019 11:21:29 +0800 Subject: [PATCH 14/20] deploy to beta (#1508) * Revert "V20191104_0" * Revert "Revert "V20191104_0"" * move build to circleci (#1505) * move build to circleci * fix circleci config * change base image to node * try node 12.13.0 image * try circleci node image * update build command * update docker image name * rm travi * trigger build * add .circleci * release to beta folder --- .circleci/config.yml | 100 +++++++++++++++++++++++++++++++++++++++++++ .dockerignore | 2 + .travis.yml | 21 --------- Dockerfile | 3 ++ Gruntfile.js | 1 + default.conf | 22 ++++++++++ package.json | 1 + 7 files changed, 129 insertions(+), 21 deletions(-) create mode 100644 .circleci/config.yml create mode 100644 .dockerignore delete mode 100644 .travis.yml create mode 100644 Dockerfile create mode 100644 default.conf diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000000..ed42a02103 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,100 @@ +version: 2.1 +orbs: + k8s: circleci/kubernetes@0.7.0 +commands: + git_checkout_from_cache: + description: "Git checkout and save cache" + steps: + - restore_cache: + name: Git restore cache + keys: + - source-v1-{{ .Branch }}-{{ .Revision }} + - source-v1-{{ .Branch }}- + - source-v1- + - run: + name: Fetch git tags + command: | + mkdir -p ~/.ssh + echo 'github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ== ' >> ~/.ssh/known_hosts + # Fetch tags if git cache is present + if [ -e /home/circleci/project/.git ] + then + git fetch origin --tags + fi + - checkout + - run: + name: Compress git objects + command: git gc + - save_cache: + name: Git save cache + key: source-v1-{{ .Branch }}-{{ .Revision }} + paths: + - ".git" + + npm_install: + description: "Install npm modules" + steps: + - restore_cache: + name: Restore npm cache + keys: + - npm-v1-{{ checksum "package.json" }} + - npm-v1- + - run: + name: Install npm modules + command: npm install + - save_cache: + name: Save NPM cache + key: npm-v1-{{ checksum "package.json" }} + paths: + - "node_modules" + + build: + description: "Build" + steps: + - run: + name: "Grunt deploy" + command: npm run deploy-ci + + docker: + description: "Build and Push image to docker hub" + steps: + - setup_remote_docker + - run: + name: Building docker image + command: | + docker build -t ${DOCKHUB_ORGANISATION}/binary-static-webtrader:beta-${CIRCLE_SHA1} . + - run: + name: Pushing Image to docker hub + command: | + echo $DOCKERHUB_PASSWORD | docker login -u $DOCKERHUB_USERNAME --password-stdin + docker push ${DOCKHUB_ORGANISATION}/binary-static-webtrader:beta-${CIRCLE_SHA1} + + k8s_deploy: + description: "Deploy to k8s cluster" + steps: + - k8s/install-kubectl + - run: + name: Deploying to k8s cluster for service binary-webtrader + command: | + echo $CA_CRT | base64 --decode > ca.crt + kubectl --server=${KUBE_SERVER} --certificate-authority=ca.crt --token=$SERVICEACCOUNT_TOKEN set image deployment/webtrader-beta-binary-com webtrader-beta-binary-com=${DOCKHUB_ORGANISATION}/binary-static-webtrader:beta-${CIRCLE_SHA1} + +jobs: + release: + docker: + - image: circleci/node:12.13.0-stretch + steps: + - git_checkout_from_cache + - npm_install + - build + - docker + - k8s_deploy + +workflows: + release: + jobs: + - release: + filters: + branches: + only: /^development$/ + diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000000..331d38729f --- /dev/null +++ b/.dockerignore @@ -0,0 +1,2 @@ +.git +Dockerfile diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index bd97791d42..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,21 +0,0 @@ -git: - depth: 1 -matrix: - fast_finish: true -language: node_js -node_js: -- '10' -dist: trusty -branches: - only: - - master - - development -before_install: -- npm install -g npm@6.7.0 -- npm ci -install: -- npm run build -after_success: -- git config --global user.email $GITHUB_EMAIL -- git config --global user.name $GITHUB_USERNAME -- npm run deploy-gh-pages diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000000..2d45bb666b --- /dev/null +++ b/Dockerfile @@ -0,0 +1,3 @@ +FROM nginx:alpine +COPY ./dist/compressed /usr/share/nginx/html/beta +COPY ./default.conf /etc/nginx/conf.d/default.conf diff --git a/Gruntfile.js b/Gruntfile.js index 38861aa875..0d5a619648 100755 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -10,6 +10,7 @@ module.exports = function (grunt) { } } + grunt.file.setBase('./'); grunt.initConfig({ pkg, githash: { diff --git a/default.conf b/default.conf new file mode 100644 index 0000000000..758978854f --- /dev/null +++ b/default.conf @@ -0,0 +1,22 @@ +server { + listen 80; + server_name localhost; + + add_header Cache-Control "public, max-age=7200, s-maxage=600, must-revalidate"; + charset UTF-8; + + error_page 404 /404.html; + + location @custom_error_503 { + return 503; + } + + location ~ /\.git { + return 404; + } + + location / { + root /usr/share/nginx/html; + index index.html index.htm; + } +} diff --git a/package.json b/package.json index 3c110eb64a..d13e13e1e8 100644 --- a/package.json +++ b/package.json @@ -42,6 +42,7 @@ "node-sass": "^4.12.0" }, "scripts": { + "deploy-ci": "grunt", "deploy-branch": "grunt deploy-branch", "deploy-gh-pages": "grunt deploy", "start": "grunt && concurrently -k \"grunt watch\" \"grunt connect\"", From 2cc8c0d95505bef8013aea404c69c4c36eee1e3b Mon Sep 17 00:00:00 2001 From: mustofa binary Date: Wed, 27 Nov 2019 17:35:07 +0800 Subject: [PATCH 15/20] sanitize directly and add ; --- src/common/rivetsExtra.es6 | 4 +++- src/workspace/workspace.es6 | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/common/rivetsExtra.es6 b/src/common/rivetsExtra.es6 index 4b0a0ec18c..df4e32ad22 100644 --- a/src/common/rivetsExtra.es6 +++ b/src/common/rivetsExtra.es6 @@ -29,7 +29,9 @@ rv.formatters['i18n'] = (value) => { if (typeof value === 'string') return value.i18n(); return value; }; -rv.formatters['sanitize'] = (value) => value.replace(/("|'|\&|\(|\)|\<|\>)/g, ''); +rv.formatters['sanitize'] = (value) => { + return value.replace(/("|'|\&|\(|\)|\<|\>|\;)/g, ''); +} /* rivets formatter to get the property value of an object */ rv.formatters['prop'] = (value, prop) => { return value && value[prop]; diff --git a/src/workspace/workspace.es6 b/src/workspace/workspace.es6 index 6a65ec2c8b..ed9b982a06 100644 --- a/src/workspace/workspace.es6 +++ b/src/workspace/workspace.es6 @@ -20,7 +20,7 @@ const INITIAL_WORKSPACE_NAME = 'my-workspace-1'; const clone = obj => JSON.parse(JSON.stringify(obj)); -const sanitize = value => value.replace(/("|'|\&|\(|\)|\<|\>)/g, ''); +const sanitize = value => value.replace(/("|'|\&|\(|\)|\<|\>|\;)/g, ''); const state = { route: 'active', // one of ['active', 'saved', 'rename', 'saveas'] @@ -213,7 +213,7 @@ const state = { const {name} = w; const inx = _.findIndex(state.workspaces, {name: name}); const workspace = inx !== -1 ? state.workspaces[inx] : local_storage.get('states'); - workspace.name = name; + workspace.name = sanitize(name); workspace.template_type = 'workspace-template'; workspace.random = state.file.hash_code(workspace) var json = JSON.stringify(workspace); From 3abc48c94ceb7ac54b3f2e1ebd159c8815726837 Mon Sep 17 00:00:00 2001 From: mustofa binary Date: Thu, 28 Nov 2019 13:16:54 +0800 Subject: [PATCH 16/20] single line --- src/common/rivetsExtra.es6 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/common/rivetsExtra.es6 b/src/common/rivetsExtra.es6 index df4e32ad22..8ec8b792ac 100644 --- a/src/common/rivetsExtra.es6 +++ b/src/common/rivetsExtra.es6 @@ -29,9 +29,7 @@ rv.formatters['i18n'] = (value) => { if (typeof value === 'string') return value.i18n(); return value; }; -rv.formatters['sanitize'] = (value) => { - return value.replace(/("|'|\&|\(|\)|\<|\>|\;)/g, ''); -} +rv.formatters['sanitize'] = (value) => value.replace(/("|'|\&|\(|\)|\<|\>|\;)/g, ''); /* rivets formatter to get the property value of an object */ rv.formatters['prop'] = (value, prop) => { return value && value[prop]; From 3b0953421aa8e17c1548530ead0aac8665bcf02a Mon Sep 17 00:00:00 2001 From: mustofa binary Date: Thu, 28 Nov 2019 14:14:21 +0800 Subject: [PATCH 17/20] add home html to register free account --- src/oauth/login.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/oauth/login.es6 b/src/oauth/login.es6 index 074f12d47d..61a4b2da28 100644 --- a/src/oauth/login.es6 +++ b/src/oauth/login.es6 @@ -68,7 +68,7 @@ const init_state = (root, win) => { login(); }, onRegister: () => { - const register_link = getBinaryUrl('home'); + const register_link = getBinaryUrl('home.html'); window.open(register_link, '_blank'); }, }; From 2b64ea8bec1c64802b2548f45de0d3d4f8ec5131 Mon Sep 17 00:00:00 2001 From: oskar-binary Date: Thu, 12 Dec 2019 17:02:51 +0800 Subject: [PATCH 18/20] hide indonesian --- src/common/util.js | 2 +- src/navigation/navigation.es6 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/util.js b/src/common/util.js index 3e437abcaf..b0f129389a 100755 --- a/src/common/util.js +++ b/src/common/util.js @@ -313,7 +313,7 @@ function getSupportedLanguages() { { value: 'de', name: 'Deutsch'}, { value: 'es', name: 'Español'}, { value: 'fr', name: 'Français'}, - { value: 'id', name: 'Indonesia'}, + // { value: 'id', name: 'Indonesia'}, { value: 'it', name: 'Italiano'}, { value: 'pl', name: 'Polish'}, { value: 'pt', name: 'Português'}, diff --git a/src/navigation/navigation.es6 b/src/navigation/navigation.es6 index 43545f50d7..0329bba4a1 100644 --- a/src/navigation/navigation.es6 +++ b/src/navigation/navigation.es6 @@ -205,7 +205,7 @@ const initLang = (root) => { { value: 'de', name: 'Deutsch'}, { value: 'es', name: 'Español'}, { value: 'fr', name: 'Français'}, - { value: 'id', name: 'Indonesia'}, + // { value: 'id', name: 'Indonesia'}, { value: 'it', name: 'Italiano'}, { value: 'pl', name: 'Polish'}, { value: 'pt', name: 'Português'}, From e5f84edd2c9c40c38fda9fe62977eb63463a3dc5 Mon Sep 17 00:00:00 2001 From: oskar-binary Date: Wed, 15 Jan 2020 14:05:13 +0800 Subject: [PATCH 19/20] gitignore circle ci and dockerfile --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index e4c64474f6..20120763f4 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,6 @@ reports selenium-debug.log test-config.js .vscode/launch.json + +.circleci +Dockerfile From 26040ac1036e7d10aedbb263062e9c9c7a92fa25 Mon Sep 17 00:00:00 2001 From: mustofa binary Date: Wed, 22 Jan 2020 11:08:37 +0800 Subject: [PATCH 20/20] remove doorbell styles --- src/main.css | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/src/main.css b/src/main.css index ca7c7f3319..f73eeb3f2f 100755 --- a/src/main.css +++ b/src/main.css @@ -495,28 +495,6 @@ table.dataTable thead th, table.dataTable thead td, table.dataTable.no-footer { /* make dropdowns consistent with binary-style */ select + .ui-selectmenu-button { border-radius: 3px;} -#doorbell-button { - right: -67px; - transform: rotate(-90deg); - -webkit-transform: rotate(-90deg); - -moz-transform: rotate(-90deg); - -o-transform: rotate(-90deg); - -ms-transform: rotate(-90deg); - font-size: inherit; - background-color: #2E8836; - bottom: 100px; - z-index: +1000; -} -#doorbell-button:hover { - right: -40px; - transition: right 100ms linear; -} - -#doorbell-error { color: red; } -#doorbell-form textarea { outline: 0; } -#doorbell-container #doorbell-form legend { font-size: 1em; } -#doorbell-container #doorbell-close.close { opacity: 1; } - /*hide input buttons*/ .ui-spinner-button { display: none;