Skip to content

Commit 3ed141f

Browse files
mohammad-derivmohammad-deriv
committed
Merge remote-tracking branch 'upstream/master' into eslint
2 parents 2669fd6 + 2a69d7a commit 3ed141f

47 files changed

Lines changed: 1152 additions & 935 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎scripts/bin/GenerateStaticData.pm‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ sub _texts {
4343
push @texts, localize('You must accept the terms and conditions to open an account.');
4444
push @texts, localize('We are not accepting accounts from residents of this country at the present time.');
4545
push @texts, localize('End time must be after start time.');
46+
push @texts, localize('Time is in the wrong format.');
4647
# top bar
4748
push @texts, localize('Upgrade to a Real Account');
4849
push @texts, localize('Upgrade to a Financial Account');
@@ -132,6 +133,10 @@ sub _texts {
132133
push @texts, localize('Th');
133134
push @texts, localize('Fr');
134135
push @texts, localize('Sa');
136+
push @texts, localize('Hour');
137+
push @texts, localize('Minute');
138+
push @texts, localize('AM');
139+
push @texts, localize('PM');
135140
push @texts, localize('This contract won');
136141
push @texts, localize('This contract lost');
137142
push @texts, localize('Loss');

‎src/config/en.po‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -767,6 +767,9 @@ msgstr ""
767767
msgid "A university degree or accredited translation certification preferred"
768768
msgstr ""
769769

770+
msgid "AM"
771+
msgstr ""
772+
770773
msgid "API"
771774
msgstr ""
772775

@@ -2967,6 +2970,9 @@ msgstr ""
29672970
msgid "Higher/Lower trades"
29682971
msgstr ""
29692972

2973+
msgid "Hour"
2974+
msgstr ""
2975+
29702976
msgid "Housewife / Househusband"
29712977
msgstr ""
29722978

@@ -4301,6 +4307,9 @@ msgstr ""
43014307
msgid "Minimum of six lower and uppercase letters with numbers"
43024308
msgstr ""
43034309

4310+
msgid "Minute"
4311+
msgstr ""
4312+
43044313
msgid "Miss"
43054314
msgstr ""
43064315

@@ -4760,6 +4769,9 @@ msgstr ""
47604769
msgid "Ownership, content, and liability of the Affiliate's websites are the sole responsibility of the Affiliate. You will be solely responsible for the development, operation, and maintenance of your website and for all materials that appear on your website. You will indemnify and hold us harmless from all claims, damages, and expenses (including, without limitation to, attorneys' fees) relating to the development, operation, maintenance, and contents of your website."
47614770
msgstr ""
47624771

4772+
msgid "PM"
4773+
msgstr ""
4774+
47634775
msgid "Participating in the forex, stocks or commodities markets?"
47644776
msgstr ""
47654777

@@ -4937,10 +4949,10 @@ msgstr ""
49374949
msgid "Please enter an integer value"
49384950
msgstr ""
49394951

4940-
msgid "Please enter date in the format YYYY-MM-DD HH:mm (local time)."
4952+
msgid "Please enter date in the format DD MMM, YYYY HH:mm (local time)."
49414953
msgstr ""
49424954

4943-
msgid "Please enter date in the format YYYY-MM-DD."
4955+
msgid "Please enter date in the format DD MMM, YYYY."
49444956
msgstr ""
49454957

49464958
msgid "Please enter your current password."
@@ -6576,6 +6588,9 @@ msgstr ""
65766588
msgid "Time"
65776589
msgstr ""
65786590

6591+
msgid "Time is in the wrong format."
6592+
msgstr ""
6593+
65796594
msgid "Time out until"
65806595
msgstr ""
65816596

@@ -7872,6 +7887,9 @@ msgstr ""
78727887
msgid "f"
78737888
msgstr ""
78747889

7890+
msgid "h"
7891+
msgstr ""
7892+
78757893
msgid "hour"
78767894
msgstr ""
78777895

@@ -7908,12 +7926,18 @@ msgstr ""
79087926
msgid "max: 100,000"
79097927
msgstr ""
79107928

7929+
msgid "min"
7930+
msgstr ""
7931+
79117932
msgid "min: 1,000"
79127933
msgstr ""
79137934

79147935
msgid "minimum available duration"
79157936
msgstr ""
79167937

7938+
msgid "mins"
7939+
msgstr ""
7940+
79177941
msgid "minute"
79187942
msgstr ""
79197943

‎src/config/locales/de.po‎

Lines changed: 36 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -793,6 +793,9 @@ msgstr "Ein Universitätsabschluss in Marketing oder Computerwissenschaften ist
793793
msgid "A university degree or accredited translation certification preferred"
794794
msgstr "Ein Universitätsabschluss oder akkreditierte Übersetzerzulassung bevorzugt"
795795

796+
msgid "AM"
797+
msgstr ""
798+
796799
msgid "API"
797800
msgstr "API"
798801

@@ -3015,6 +3018,9 @@ msgstr "Höher/Tiefer Kontrakte werden zum Kaufkurs erstattet, wenn weniger als
30153018
msgid "Higher/Lower trades"
30163019
msgstr "Höhere/Tiefere Stände"
30173020

3021+
msgid "Hour"
3022+
msgstr ""
3023+
30183024
msgid "Housewife / Househusband"
30193025
msgstr "Housewife / Househusband"
30203026

@@ -4355,6 +4361,11 @@ msgstr "Mindestens %1 Zeichen sind erforderlich."
43554361
msgid "Minimum of six lower and uppercase letters with numbers"
43564362
msgstr "Mindestens sechs Klein- und Großbuchstaben mit Zahlen"
43574363

4364+
#, fuzzy
4365+
#| msgid "Minutes"
4366+
msgid "Minute"
4367+
msgstr "Minuten"
4368+
43584369
msgid "Miss"
43594370
msgstr "Verpasst"
43604371

@@ -4820,6 +4831,9 @@ msgstr "Das Eigentumsrecht an und der Inhalt der Website von %1 bleiben unser Ei
48204831
msgid "Ownership, content, and liability of the Affiliate's websites are the sole responsibility of the Affiliate. You will be solely responsible for the development, operation, and maintenance of your website and for all materials that appear on your website. You will indemnify and hold us harmless from all claims, damages, and expenses (including, without limitation to, attorneys' fees) relating to the development, operation, maintenance, and contents of your website."
48214832
msgstr "Eigentum, Inhalt und Haftung für die Partnersiten liegen in der alleinigen Verantwortung des Partners. Sie alleine sind für die Entwicklung, den Betrieb und die Pflege Ihrer Website und aller Materialien verantwortlich, die auf Ihrer Website veröffentlicht werden. Sie verpflichten sich, uns von allen Ansprüchen, Schäden und Kosten (unter anderem Anwaltshonoraren) hinsichtlich der Entwicklung, des Betriebs, der Pflege und der Inhalte Ihrer Website freizustellen und diese schadlos zu halten."
48224833

4834+
msgid "PM"
4835+
msgstr ""
4836+
48234837
msgid "Participating in the forex, stocks or commodities markets?"
48244838
msgstr "Möchten Sie sich auf Forex-, Aktien- oder Rohstoffmärkten engagieren?"
48254839

@@ -5001,10 +5015,14 @@ msgstr "Bitte geben Sie einen gültigen Betrag ein."
50015015
msgid "Please enter an integer value"
50025016
msgstr "Bitte geben Sie einen ganzzahligen Wert ein"
50035017

5004-
msgid "Please enter date in the format YYYY-MM-DD HH:mm (local time)."
5018+
#, fuzzy
5019+
#| msgid "Please enter date in the format YYYY-MM-DD HH:mm (local time)."
5020+
msgid "Please enter date in the format DD MMM, YYYY HH:mm (local time)."
50055021
msgstr "Bitte geben Sie das Datum im folgenden Format ein: JJJJ-MM-TT HH:mm (Ortszeit)."
50065022

5007-
msgid "Please enter date in the format YYYY-MM-DD."
5023+
#, fuzzy
5024+
#| msgid "Please enter date in the format YYYY-MM-DD."
5025+
msgid "Please enter date in the format DD MMM, YYYY."
50085026
msgstr "Bitte geben Sie das Datum im folgenden Format ein: JJJJ-MM-TT."
50095027

50105028
msgid "Please enter your current password."
@@ -6656,6 +6674,11 @@ msgstr "Rang"
66566674
msgid "Time"
66576675
msgstr "Zeit"
66586676

6677+
#, fuzzy
6678+
#| msgid "Start time is in the future."
6679+
msgid "Time is in the wrong format."
6680+
msgstr "Die Startzeit liegt in der Zukunft."
6681+
66596682
msgid "Time out until"
66606683
msgstr "Timeout bis"
66616684

@@ -7976,6 +7999,11 @@ msgstr "E-Mail Adresse"
79767999
msgid "f"
79778000
msgstr "f"
79788001

8002+
#, fuzzy
8003+
#| msgid "Th"
8004+
msgid "h"
8005+
msgstr "Do"
8006+
79798007
msgid "hour"
79808008
msgstr "Stunde"
79818009

@@ -8012,12 +8040,18 @@ msgstr "M"
80128040
msgid "max: 100,000"
80138041
msgstr "Max: 100.000"
80148042

8043+
msgid "min"
8044+
msgstr "Min."
8045+
80158046
msgid "min: 1,000"
80168047
msgstr "Min: 1.000"
80178048

80188049
msgid "minimum available duration"
80198050
msgstr "kürzeste vorhandene Dauer"
80208051

8052+
msgid "mins"
8053+
msgstr ""
8054+
80218055
msgid "minute"
80228056
msgstr "Minute"
80238057

@@ -10902,9 +10936,6 @@ msgstr "Allgemeine Geschäftsbedingungen Zustimmung"
1090210936
#~ msgid "Start time %1 must be before end time %2"
1090310937
#~ msgstr "Die Startzeit %1 muss vor der Ablaufzeit %2 liegen"
1090410938

10905-
#~ msgid "Start time is in the future."
10906-
#~ msgstr "Die Startzeit liegt in der Zukunft."
10907-
1090810939
#~ msgid "Start time is in the past"
1090910940
#~ msgstr "Die Startzeit liegt in der Vergangenheit"
1091010941

@@ -13513,9 +13544,6 @@ msgstr "Allgemeine Geschäftsbedingungen Zustimmung"
1351313544
#~ msgid "explanation"
1351413545
#~ msgstr "Erklärung"
1351513546

13516-
#~ msgid "min"
13517-
#~ msgstr "Min."
13518-
1351913547
#~ msgid "or Email us at"
1352013548
#~ msgstr "oder schreiben Sie uns eine E-Mail an"
1352113549

@@ -18716,9 +18744,6 @@ msgstr "Allgemeine Geschäftsbedingungen Zustimmung"
1871618744
#~ msgid "Majors"
1871718745
#~ msgstr "Haupt"
1871818746

18719-
#~ msgid "Minutes"
18720-
#~ msgstr "Minuten"
18721-
1872218747
#~ msgid "Normalize to 100"
1872318748
#~ msgstr "Auf 100 normalisieren"
1872418749

‎src/config/locales/es.po‎

Lines changed: 36 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -796,6 +796,9 @@ msgstr "Un título universitario en marketing o informática es una ventaja"
796796
msgid "A university degree or accredited translation certification preferred"
797797
msgstr "Un título universitario o una certificación de traducción acreditada tiene preferencia"
798798

799+
msgid "AM"
800+
msgstr ""
801+
799802
msgid "API"
800803
msgstr "API"
801804

@@ -3054,6 +3057,9 @@ msgstr "Los contratos Superiores/Inferiores serán reembolsados con el precio de
30543057
msgid "Higher/Lower trades"
30553058
msgstr "Contratos Superior/Inferior"
30563059

3060+
msgid "Hour"
3061+
msgstr ""
3062+
30573063
msgid "Housewife / Househusband"
30583064
msgstr "Ama / Amo de casa"
30593065

@@ -4402,6 +4408,11 @@ msgstr "Mínimo de %1 caracteres requeridos."
44024408
msgid "Minimum of six lower and uppercase letters with numbers"
44034409
msgstr "Un mínimo de seis letras minúsculas y mayúsculas con los números"
44044410

4411+
#, fuzzy
4412+
#| msgid "Minutes"
4413+
msgid "Minute"
4414+
msgstr "Minutos"
4415+
44054416
msgid "Miss"
44064417
msgstr "Srta."
44074418

@@ -4873,6 +4884,9 @@ msgstr "La propiedad y el contenido del sitio web de %1 sigue siendo nuestra pro
48734884
msgid "Ownership, content, and liability of the Affiliate's websites are the sole responsibility of the Affiliate. You will be solely responsible for the development, operation, and maintenance of your website and for all materials that appear on your website. You will indemnify and hold us harmless from all claims, damages, and expenses (including, without limitation to, attorneys' fees) relating to the development, operation, maintenance, and contents of your website."
48744885
msgstr "La propiedad, el contenido y la responsabilidad de los sitios web del Afiliado son responsabilidad exclusiva del afiliado. Usted será el único responsable del desarrollo, funcionamiento y mantenimiento de su sitio web y de todos los materiales que aparecen en su sitio Web. Usted nos indemnizará y nos eximirá de responsabilidad de todas las reclamaciones, daños y gastos (incluyendo, sin limitación, honorarios de abogados) relacionados con el desarrollo, funcionamiento, mantenimiento y contenido de su sitio Web."
48754886

4887+
msgid "PM"
4888+
msgstr ""
4889+
48764890
msgid "Participating in the forex, stocks or commodities markets?"
48774891
msgstr "¿Quiere participar en los mercados de divisas, bursátiles o de materias primas?"
48784892

@@ -5058,10 +5072,14 @@ msgstr "Ingrese un monto válido."
50585072
msgid "Please enter an integer value"
50595073
msgstr "Ingrese un valor entero"
50605074

5061-
msgid "Please enter date in the format YYYY-MM-DD HH:mm (local time)."
5075+
#, fuzzy
5076+
#| msgid "Please enter date in the format YYYY-MM-DD HH:mm (local time)."
5077+
msgid "Please enter date in the format DD MMM, YYYY HH:mm (local time)."
50625078
msgstr "Ingrese una fecha en el formato AAAA-MM-DD HH:mm (hora local)."
50635079

5064-
msgid "Please enter date in the format YYYY-MM-DD."
5080+
#, fuzzy
5081+
#| msgid "Please enter date in the format YYYY-MM-DD."
5082+
msgid "Please enter date in the format DD MMM, YYYY."
50655083
msgstr "Ingrese una fecha en el formato AAAA-MM-DD."
50665084

50675085
msgid "Please enter your current password."
@@ -6735,6 +6753,11 @@ msgstr "Nivel"
67356753
msgid "Time"
67366754
msgstr "Hora"
67376755

6756+
#, fuzzy
6757+
#| msgid "Start time is in the future."
6758+
msgid "Time is in the wrong format."
6759+
msgstr "La hora de inicio es en el futuro."
6760+
67386761
msgid "Time out until"
67396762
msgstr "Pausa hasta"
67406763

@@ -8071,6 +8094,11 @@ msgstr "correo electrónico"
80718094
msgid "f"
80728095
msgstr "f"
80738096

8097+
#, fuzzy
8098+
#| msgid "Th"
8099+
msgid "h"
8100+
msgstr "JU"
8101+
80748102
msgid "hour"
80758103
msgstr "hora"
80768104

@@ -8111,12 +8139,18 @@ msgstr "m"
81118139
msgid "max: 100,000"
81128140
msgstr "Menos de $100.000"
81138141

8142+
msgid "min"
8143+
msgstr "min"
8144+
81148145
msgid "min: 1,000"
81158146
msgstr ""
81168147

81178148
msgid "minimum available duration"
81188149
msgstr "duración mínima disponible"
81198150

8151+
msgid "mins"
8152+
msgstr ""
8153+
81208154
msgid "minute"
81218155
msgstr "minuto"
81228156

@@ -11100,9 +11134,6 @@ msgstr "Acuerdo con los términos y condiciones"
1110011134
#~ msgid "Start time %1 must be before end time %2"
1110111135
#~ msgstr "La hora de inicio %1 debe ser anterior a la hora de la finalización %2"
1110211136

11103-
#~ msgid "Start time is in the future."
11104-
#~ msgstr "La hora de inicio es en el futuro."
11105-
1110611137
#~ msgid "Start time is in the past"
1110711138
#~ msgstr "La hora de inicio ya ha pasado"
1110811139

@@ -13660,9 +13691,6 @@ msgstr "Acuerdo con los términos y condiciones"
1366013691
#~ msgid "explanation"
1366113692
#~ msgstr "explicación"
1366213693

13663-
#~ msgid "min"
13664-
#~ msgstr "min"
13665-
1366613694
#~ msgid "or Email us at"
1366713695
#~ msgstr "o contáctenos a través de correo electrónico"
1366813696

@@ -18983,9 +19011,6 @@ msgstr "Acuerdo con los términos y condiciones"
1898319011
#~ msgid "Majors"
1898419012
#~ msgstr "Mayores"
1898519013

18986-
#~ msgid "Minutes"
18987-
#~ msgstr "Minutos"
18988-
1898919014
#~ msgid "Normalize to 100"
1899019015
#~ msgstr "Normalizar en 100"
1899119016

0 commit comments

Comments
 (0)