Merge branch 'master' into shahrizal/japanui_fix

Author: shahrizal-binary

scripts/config/pages.pl

@@ -60,8 +60,9 @@ sub all_pages {
         ['paymentagent/transferws',      'cashier/paymentagent_transferws',           'default', 'Payment Agent Transfer'],
         ['paymentagent/withdrawws',      'cashier/paymentagent_withdrawws',           'default', 'Payment Agent Withdrawal'],
 
-        ['jptrading', 'bet/japan',   'default', 'Sharp Prices. Smart Trading.'],
-        ['trading',   'bet/static',  'default', 'Sharp Prices. Smart Trading.'],
+        ['jptrading',    'bet/japan',       'default', 'Sharp Prices. Smart Trading.'],
+        ['trading',      'bet/static',      'default', 'Sharp Prices. Smart Trading.'],
+        ['trading_beta', 'bet/beta/static', 'default', 'Sharp Prices. Smart Trading.'],
 
         ['new_account/virtualws',        'new_account/virtualws',       'default', 'Create New Account'],
         ['new_account/realws',           'new_account/realws',          'default', 'Real Money Account Opening'],
@@ -92,8 +93,9 @@ sub all_pages {
         ['user/reality_check_frequencyws',  'user/reality_check_frequencyws',                 'default', 'Reality Check'],
         ['user/reality_check_summaryws',    'user/reality_check_summaryws',                   'default', 'Reality Check'],
 
-        ['logged_inws',           'global/logged_inws',  undef],
-        ['trade/bet_explanation', 'bet/explanation',     undef],
+        ['logged_inws',                'global/logged_inws',   undef],
+        ['trade/bet_explanation',      'bet/explanation',      undef],
+        ['trade/bet_explanation_beta', 'bet/beta/explanation', undef],
     );
 }
 

src/config/en.po

@@ -189,6 +189,9 @@ msgstr ""
 msgid "%1 offers the world's financial markets in a simple, user-friendly platform."
 msgstr ""
 
+msgid "%1 opens an office in the QSentral office building in central Kuala Lumpur to further expand its IT development team."
+msgstr ""
+
 msgid "%1 prices are benchmarked against the interbank options market, so you always get best-in-class prices for your trades."
 msgstr ""
 
@@ -1282,6 +1285,9 @@ msgstr ""
 msgid "Binary Bot released"
 msgstr ""
 
+msgid "Binary Group Services Sdn Bhd, 30-10, Q Sentral, Jalan Stesen Sentral 2, 50470 Kuala Lumpur"
+msgstr ""
+
 msgid "Binary Group Services Sdn Bhd, C-13-02, iTech Tower, Jalan Impact, Cyber 6, 63000 Cyberjaya, Selangor Darul Ehsan"
 msgstr ""
 
@@ -1297,6 +1303,9 @@ msgstr ""
 msgid "Binary Investments (Europe) Ltd, Suite 2, Tower Road, Msida MSD1825, Malta. Licensed and regulated as a Category 3 Investment Services provider by the Malta Financial Services Authority (license no. IS/70156)."
 msgstr ""
 
+msgid "Binary KK granted Japan license"
+msgstr ""
+
 msgid "Binary KK, Hiroo Miyata Bldg 3F, 9-16, Hiroo 1-chome, Shibuya-ku, Tokyo 150-0012, Japan"
 msgstr ""
 
@@ -1344,6 +1353,9 @@ msgstr ""
 msgid "Binary trading is very simple."
 msgstr ""
 
+msgid "Binary's Japanese subsidiary Binary KK is licensed by the KLFB as a Type 1 Financial Instruments Business in Japan."
+msgstr ""
+
 msgid "Binary's Japanese subsidiary Binary KK opens an office in Tokyo and starts the process of applying for relevant licenses."
 msgstr ""
 
@@ -1905,6 +1917,9 @@ msgstr ""
 msgid "Customer Support"
 msgstr ""
 
+msgid "Cyberjaya Office"
+msgstr ""
+
 msgid "Daily Reset Indices"
 msgstr ""
 
@@ -3293,9 +3308,6 @@ msgstr ""
 msgid "Japan website Download Text for Pre-contract Document"
 msgstr ""
 
-msgid "Japan website Download Text for Terms and Conditions Document"
-msgstr ""
-
 msgid "Japan website Eliminating Antisocial Forces List item 1"
 msgstr ""
 
@@ -3785,6 +3797,9 @@ msgstr ""
 msgid "Knowledge of probability theory, stochastic calculus, numerical methods, Monte-Carlo simulation, differential equations, econometrics, and statistical modeling"
 msgstr ""
 
+msgid "Kuala Lumpur Office"
+msgstr ""
+
 msgid "Languages"
 msgstr ""
 
@@ -4181,6 +4196,9 @@ msgstr ""
 msgid "New Password"
 msgstr ""
 
+msgid "New Trade"
+msgstr ""
+
 msgid "New password"
 msgstr ""
 
@@ -6195,6 +6213,9 @@ msgstr ""
 msgid "Tier"
 msgstr ""
 
+msgid "Time"
+msgstr ""
+
 msgid "Time out until"
 msgstr ""
 
@@ -6513,6 +6534,9 @@ msgstr ""
 msgid "View"
 msgstr ""
 
+msgid "View Details"
+msgstr ""
+
 msgid "View Updated Portfolio"
 msgstr ""
 
@@ -6918,6 +6942,9 @@ msgstr ""
 msgid "Withdraw: Not applicable"
 msgstr ""
 
+msgid "Withdrawal"
+msgstr ""
+
 msgid "Withdrawal Limits"
 msgstr ""
 
@@ -8205,6 +8232,33 @@ msgstr ""
 msgid "{JAPAN ONLY}years"
 msgstr ""
 
+msgid "{Japan Only}"
+msgstr ""
+
+msgid "{Japan Only} Download Terms and Conditions Document file"
+msgstr ""
+
+msgid "{Japan Only}Binary option specialist for over 15 years "
+msgstr ""
+
+msgid "{Japan Only}Fully licenced in Japan"
+msgstr ""
+
+msgid "{Japan Only}Live chart tools"
+msgstr ""
+
+msgid "{Japan Only}Segregated Customer Account Balances are 100% Safe"
+msgstr ""
+
+msgid "{Japan Only}Trade all binary option types"
+msgstr ""
+
+msgid "{Japan Only}Trade the major currencies"
+msgstr ""
+
+msgid "{Japan Only}Worldwide award-winning pioneer in FX binary options trading"
+msgstr ""
+
 msgid "Online Trading platform for binary options on Forex, Indices, Commodities and Smart Indices"
 msgstr ""
 

src/config/locales/ar.po

@@ -186,6 +186,9 @@ msgstr "%1 تقدم طرقاً جديدة للتداول"
 msgid "%1 offers the world's financial markets in a simple, user-friendly platform."
 msgstr "تقدم %1 أسواق المال العالمية فى منصة تداول بسيطة وسهلة الاستخدام."
 
+msgid "%1 opens an office in the QSentral office building in central Kuala Lumpur to further expand its IT development team."
+msgstr ""
+
 msgid "%1 prices are benchmarked against the interbank options market, so you always get best-in-class prices for your trades."
 msgstr "يتم قياس أسعار %1 مقارنة بأسعار سوق الخيارات بين البنوك لذلك تأكد أنك تحصل دوما على أفضل الأسعار لتداولاتك."
 
@@ -1417,6 +1420,11 @@ msgstr "بيناري (أي أو أم) المحدودة، الدور الأول،
 msgid "Binary Bot released"
 msgstr "قواعد الخيارات الثنائية"
 
+#, fuzzy
+#| msgid "Binary Group Services Sdn Bhd, C-13-02, iTech Tower, Jalan Impact, Cyber 6, 63000 Cyberjaya, Selangor Darul Ehsan"
+msgid "Binary Group Services Sdn Bhd, 30-10, Q Sentral, Jalan Stesen Sentral 2, 50470 Kuala Lumpur"
+msgstr "Binary Group Services Sdn Bhd, C-13-02, iTech Tower, Jalan Impact, Cyber 6, 63000 Cyberjaya, Selangor Darul Ehsan"
+
 msgid "Binary Group Services Sdn Bhd, C-13-02, iTech Tower, Jalan Impact, Cyber 6, 63000 Cyberjaya, Selangor Darul Ehsan"
 msgstr "Binary Group Services Sdn Bhd, C-13-02, iTech Tower, Jalan Impact, Cyber 6, 63000 Cyberjaya, Selangor Darul Ehsan"
 
@@ -1434,6 +1442,11 @@ msgstr "بيناري للاستثمارات (أوروبا) المحدودة، ب
 msgid "Binary Investments (Europe) Ltd, Suite 2, Tower Road, Msida MSD1825, Malta. Licensed and regulated as a Category 3 Investment Services provider by the Malta Financial Services Authority (license no. IS/70156)."
 msgstr "بيناري للاستثمارات (أوروبا) المحدودة، جناح رقم 2، طريق تاور، مسيدا إم إس دى 1825، مالطا. مرخصة وتخضع للرقابة ضمن الفئة 3 مقدم لخدمات الإستثمار من هيئة مالطا للخدمات المالية (رقم الترخيص IS/70156)."
 
+#, fuzzy
+#| msgid "Binary granted Investment Services license"
+msgid "Binary KK granted Japan license"
+msgstr "شركة بيناري تمنح رخصة لخدمات الإستثمار"
+
 msgid "Binary KK, Hiroo Miyata Bldg 3F, 9-16, Hiroo 1-chome, Shibuya-ku, Tokyo 150-0012, Japan"
 msgstr "بيناري KK العنوان: Hiroo Miyata Bldg 3F, 9-16, Hiroo 1-chome, Shibuya-ku, Tokyo 150-0012, Japan"
 
@@ -1485,6 +1498,9 @@ msgstr "تداول الثنائيات مثالى للأفراد ولمحترفي
 msgid "Binary trading is very simple."
 msgstr "تداول الثنائيات بسيط جداً."
 
+msgid "Binary's Japanese subsidiary Binary KK is licensed by the KLFB as a Type 1 Financial Instruments Business in Japan."
+msgstr ""
+
 msgid "Binary's Japanese subsidiary Binary KK opens an office in Tokyo and starts the process of applying for relevant licenses."
 msgstr "الشركة التابعة لبيناري في اليابان (Binary KK) تفتح مكتبا لها في طوكيو وتبدأ عملية التقدم للحصول على التراخيص اللازمة."
 
@@ -2082,6 +2098,9 @@ msgstr "ممثلي خدمة العملاء"
 msgid "Customer Support"
 msgstr "دعم العملاء"
 
+msgid "Cyberjaya Office"
+msgstr ""
+
 msgid "Daily Reset Indices"
 msgstr "إعادة تعيين المؤشرات اليومية"
 
@@ -3548,9 +3567,6 @@ msgstr "اليابان"
 msgid "Japan website Download Text for Pre-contract Document"
 msgstr "Japan website Download Text for Pre-contract Document"
 
-msgid "Japan website Download Text for Terms and Conditions Document"
-msgstr "Japan website Download Text for Terms and Conditions Document"
-
 msgid "Japan website Eliminating Antisocial Forces List item 1"
 msgstr "Japan website Eliminating Antisocial Forces List item 1"
 
@@ -4040,6 +4056,9 @@ msgstr "تعتبر اضافة وجود معرفة بنظرية الاحتمال
 msgid "Knowledge of probability theory, stochastic calculus, numerical methods, Monte-Carlo simulation, differential equations, econometrics, and statistical modeling"
 msgstr "المعرفة بنظرية الاحتمالات وحساب التفاضل والتكامل العشوائي والأساليب العددية، ومحاكاة Monte-Carlo، معادلات التفاضل، والاقتصاد القياسي والنمذجة الإحصائية"
 
+msgid "Kuala Lumpur Office"
+msgstr ""
+
 msgid "Languages"
 msgstr "اللغات"
 
@@ -4440,6 +4459,11 @@ msgstr "لم تستخدم من قبل"
 msgid "New Password"
 msgstr "كلمة المرور الجديدة"
 
+#, fuzzy
+#| msgid "Trade"
+msgid "New Trade"
+msgstr "التداول"
+
 msgid "New password"
 msgstr "كلمة المرور الجديدة"
 
@@ -6577,6 +6601,9 @@ msgstr "علامة تطبيق التداول"
 msgid "Tier"
 msgstr "المستوى"
 
+msgid "Time"
+msgstr "وقت"
+
 msgid "Time out until"
 msgstr "الوقت ينتهي حتى"
 
@@ -6921,6 +6948,11 @@ msgstr "الإصدار 40.آخر تعديل في 12 - 05 - 2016."
 msgid "View"
 msgstr "شاهد"
 
+#, fuzzy
+#| msgid "Details"
+msgid "View Details"
+msgstr "التفاصيل"
+
 msgid "View Updated Portfolio"
 msgstr "اطلع على محفظتك المحدّثة"
 
@@ -7360,6 +7392,9 @@ msgstr "سحب: %1 أيام عمل"
 msgid "Withdraw: Not applicable"
 msgstr "السحب: لا ينطبق"
 
+msgid "Withdrawal"
+msgstr "السحب"
+
 msgid "Withdrawal Limits"
 msgstr "حدود السحب"
 
@@ -8795,6 +8830,37 @@ msgstr "{JAPAN ONLY}Units"
 msgid "{JAPAN ONLY}years"
 msgstr "{JAPAN ONLY}Units"
 
+msgid "{Japan Only}"
+msgstr ""
+
+#, fuzzy
+#| msgid "Japan website Download Text for Terms and Conditions Document"
+msgid "{Japan Only} Download Terms and Conditions Document file"
+msgstr "Japan website Download Text for Terms and Conditions Document"
+
+msgid "{Japan Only}Binary option specialist for over 15 years "
+msgstr ""
+
+msgid "{Japan Only}Fully licenced in Japan"
+msgstr ""
+
+msgid "{Japan Only}Live chart tools"
+msgstr ""
+
+msgid "{Japan Only}Segregated Customer Account Balances are 100% Safe"
+msgstr ""
+
+msgid "{Japan Only}Trade all binary option types"
+msgstr ""
+
+msgid "{Japan Only}Trade the major currencies"
+msgstr ""
+
+#, fuzzy
+#| msgid "%1 is the award-winning industry pioneer in online options trading."
+msgid "{Japan Only}Worldwide award-winning pioneer in FX binary options trading"
+msgstr "%1 حائزة على جائزة الريادة في صناعة تداول الخيارات عبر الإنترنت."
+
 msgid "Online Trading platform for binary options on Forex, Indices, Commodities and Smart Indices"
 msgstr "منصة التداول للخيارات الثنائية فى العملات والمؤشرات والسلع والمؤشرات الذكية"
 
@@ -9263,9 +9329,6 @@ msgstr "لموافقة على الشروط والأحكام"
 #~ msgid "The Binary.com Terms and Conditions;"
 #~ msgstr "الشروط والأحكام لBinary.com"
 
-#~ msgid "Time"
-#~ msgstr "وقت"
-
 #, fuzzy
 #~| msgid "Title"
 #~ msgid "Titles"
@@ -10983,9 +11046,6 @@ msgstr "لموافقة على الشروط والأحكام"
 #~ msgid "Windows"
 #~ msgstr "نوافذ"
 
-#~ msgid "Withdrawal"
-#~ msgstr "السحب"
-
 #~ msgid "Workspace"
 #~ msgstr "مساحة عمل"