Merge branch 'stable'

data/clients/1.yaml

-name: "zhongbiao"
-image: "/img/clients/zhongbiao.jpg"
-url: "http://www.cs2c.com.cn/"
+name: "huawei"
+image: "/img/clients/huawei.svg"
+url: "http://www.huawei.com/"

data/clients/3.yaml

+name: "zhongbiao"
+image: "/img/clients/zhongbiao.jpg"
+url: "http://www.cs2c.com.cn/"

i18n/en.toml

 # main page
 [main_partner_title]
-other = "Our Partners"
+other = "Members"
 
 
 [main_email_subscribe_title]
@@ -27,3 +27,6 @@ other = "EVENT"
 
 [main_news_subtitle]
 other = "NEWS"
+
+[main_nav_news_name]
+other = "News"

i18n/zh.toml

@@ -26,3 +26,6 @@ other = "事件"
 
 [main_news_subtitle]
 other = "新闻"
+
+[main_nav_news_name]
+other = "新闻"

static/img/clients/huawei.svg

+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 512.001 512.001" style="enable-background:new 0 0 512.001 512.001;" xml:space="preserve">
+<g>
+	<path style="fill:#E85454;" d="M79.791,69.889c-0.759-0.941-2.158-1.005-3.007-0.144c-7.963,8.077-42.824,45.746-39.978,83.49
+		c1.668,31.302,24.619,50.224,25.898,51.256c1,0.807,34.7,36.861,155.598,97.064c0.313,0.068,1.452,0.461,2.118-0.367
+		c0,0,0.937-0.747,0.448-1.934C165.309,177.887,90.885,83.638,79.791,69.889z"/>
+	<path style="fill:#E85454;" d="M205.814,333.673c-0.393-1.345-2.037-1.345-2.037-1.345v-0.081l-154.034,5.38
+		c-1.542,0.054-2.452,1.742-1.664,3.068c17.24,29.01,45.112,50.894,74.051,43.821c20.681-5.111,67.496-37.798,82.943-48.863h-0.041
+		C206.201,334.527,205.814,333.673,205.814,333.673z"/>
+	<path style="fill:#E85454;" d="M207.605,317.232C143.62,274.058,24.143,209.535,6.656,200.139
+		c-1.121-0.602-2.523-0.033-2.882,1.188c-10.777,36.618,4.951,65.76,4.951,65.76c17.065,36.082,49.639,47.023,49.639,47.023
+		c15.1,6.164,30.15,6.57,30.15,6.57c2.341,0.434,93.585,0.068,118.048-0.055c1.043-0.026,1.58-1.037,1.58-1.037
+		C208.937,318.333,207.605,317.232,207.605,317.232z"/>
+	<path style="fill:#E85454;" d="M193.297,5.001c-41.743,10.835-64.626,53.171-51.339,98.498c0.01,0.033,0.017,0.063,0.025,0.097
+		c13.929,61.718,82.337,163.089,97.049,184.355c1.024,1.046,1.86,0.603,1.86,0.603c1.574-0.4,1.452-1.939,1.452-1.939l0.035,0.02
+		c20.978-209.73-17.293-276.71-23.052-285.449c-0.421-0.639-1.165-0.981-1.924-0.885C209.821,1.268,193.297,5.001,193.297,5.001z"/>
+	<path style="fill:#E85454;" d="M370.294,53.658c-0.011-0.03-0.02-0.059-0.029-0.09c-0.383-1.377-11.064-38.533-52.032-48.505
+		c0,0-11.249-2.846-23.523-4.714c-5.072-0.772-46.689,72.097-25.19,286.457c0.192,1.404,1.21,1.731,1.21,1.731
+		c1.513,0.609,2.266-0.858,2.266-0.858l0.009,0.022c15.135-21.849,83.166-122.737,97.011-184.157
+		C370.016,103.543,377.51,73.816,370.294,53.658z"/>
+	<path style="fill:#E85454;" d="M307.978,332.383c0,0-0.103,0.014-0.261,0.056c-1.177,0.308-1.87,1.63-1.34,2.725
+		c0.096,0.198,0.232,0.386,0.422,0.544v0.02c15.054,10.808,60.748,42.754,82.751,48.933c0,0,39.357,13.414,74.255-43.902
+		c0.805-1.323-0.107-3.03-1.655-3.084l-154.16-5.321L307.978,332.383z"/>
+	<path style="fill:#E85454;" d="M508.229,201.052c-0.37-1.236-1.763-1.838-2.899-1.225c-17.441,9.411-136.803,74.143-200.799,117.27
+		v0.028c-1.74,1.165-0.664,3.474,0.788,3.474c24.772,0.055,118.55,0.177,120.892-0.229c0,0,12.087-0.544,27.074-6.26
+		c0,0,33.355-10.602,50.689-48.488C503.974,265.622,518.728,236.104,508.229,201.052z"/>
+	<path style="fill:#E85454;" d="M475.154,153.029c2.466-39.029-32.047-75.503-39.965-83.328c-0.852-0.842-2.235-0.768-2.988,0.164
+		c-11.01,13.64-85.268,107.631-140.797,228.77h0.026c-0.887,1.91,1.085,3.583,2.554,2.736
+		c115.97-57.715,149.49-92.114,155.29-96.876C450.486,203.5,473.846,183.934,475.154,153.029z"/>
+</g>
+<g>
+	<path style="fill:#D84848;" d="M216.431,289.708C113.219,235.67,87.78,207.528,83.997,204.489
+		c-1.279-1.032-24.23-19.954-25.898-51.256c-2.146-28.45,17.131-56.852,30.165-72.575c-3.968-5.145-6.877-8.794-8.472-10.77
+		c-0.759-0.94-2.158-1.005-3.006-0.144c-7.963,8.077-42.824,45.746-39.978,83.49c1.668,31.302,24.619,50.224,25.898,51.256
+		c1.003,0.811,34.753,36.888,155.598,97.064c0.313,0.068,1.452,0.461,2.118-0.367c0,0,0.936-0.747,0.447-1.934
+		C219.403,296.05,217.921,292.872,216.431,289.708z"/>
+	<path style="fill:#D84848;" d="M109.805,320.68c0,0-15.05-0.406-30.15-6.57c0,0-32.573-10.941-49.638-47.023
+		c0,0-13.54-25.121-6.861-58.017c-7.838-4.267-13.589-7.366-16.5-8.931c-1.121-0.602-2.523-0.033-2.882,1.188
+		c-10.777,36.618,4.951,65.76,4.951,65.76c17.065,36.082,49.638,47.023,49.638,47.023c15.1,6.164,30.15,6.57,30.15,6.57
+		c1.012,0.188,18.661,0.226,40.341,0.199C117.904,320.859,110.453,320.8,109.805,320.68z"/>
+	<path style="fill:#D84848;" d="M244.434,264.27c-25.752-39.397-70.229-112.241-81.159-160.673
+		c-0.008-0.034-0.015-0.063-0.025-0.097c-13.287-45.327,9.596-87.664,51.339-98.499c0,0,2.616-0.591,6.24-1.363
+		c-0.619-1.075-1.13-1.888-1.502-2.453c-0.421-0.639-1.165-0.981-1.924-0.884c-7.583,0.967-24.106,4.7-24.106,4.7
+		c-41.743,10.835-64.626,53.171-51.339,98.498c0.01,0.033,0.017,0.063,0.025,0.097c13.929,61.718,82.337,163.089,97.049,184.355
+		c1.024,1.046,1.86,0.603,1.86,0.603c1.574-0.4,1.452-1.939,1.452-1.939l0.035,0.02C243.144,278.984,243.822,271.545,244.434,264.27
+		z"/>
+	<path style="fill:#D84848;" d="M312.528,3.726c-4.434-0.987-10.965-2.335-17.818-3.377c-5.072-0.772-46.689,72.097-25.19,286.457
+		c0.192,1.404,1.21,1.732,1.21,1.732c1.513,0.609,2.266-0.858,2.266-0.858l0.009,0.022c3.208-4.631,8.798-12.823,15.739-23.427
+		C274.425,93.143,301.875,19.579,312.528,3.726z"/>
+	<path style="fill:#D84848;" d="M328.997,333.079l-21.006-0.725l-0.013,0.028c0,0-0.103,0.014-0.261,0.056
+		c-1.177,0.308-1.87,1.63-1.34,2.726c0.096,0.198,0.232,0.386,0.422,0.544v0.02c15.054,10.808,60.748,42.754,82.752,48.933
+		c0,0,10.195,3.469,24.804-0.673C390.705,376.347,345.38,344.809,328.997,333.079z"/>
+	<path style="fill:#D84848;" d="M511.535,217.87c-0.536-5.384-1.57-11.022-3.306-16.818c-0.37-1.236-1.763-1.838-2.899-1.225
+		c-17.441,9.411-136.803,74.143-200.799,117.27v0.028c-1.74,1.165-0.665,3.474,0.788,3.474c6.521,0.014,17.826,0.033,30.984,0.046
+		C388.761,286.386,466.653,242.601,511.535,217.87z"/>
+	<path style="fill:#D84848;" d="M445.108,80.519c-4.305-5.122-7.941-8.863-9.919-10.817c-0.852-0.842-2.235-0.768-2.988,0.164
+		c-11.01,13.64-85.268,107.631-140.797,228.77h0.026c-0.887,1.91,1.085,3.583,2.554,2.736c8.005-3.984,15.603-7.852,22.841-11.612
+		C363.763,190.08,422.269,110.114,445.108,80.519z"/>
+</g>
+<g>
+	<path style="fill:#C2C2C4;" d="M59.536,461.782H19.737c-0.546,0-0.988-0.442-0.988-0.988v-31.381c0-0.546-0.442-0.988-0.988-0.988
+		H0.988c-0.546,0-0.988,0.442-0.988,0.988v80.434c0,0.546,0.442,0.988,0.988,0.988H17.76c0.546,0,0.988-0.442,0.988-0.988v-32.414
+		c0-0.546,0.442-0.988,0.988-0.988h39.799c0.546,0,0.988,0.442,0.988,0.988v32.414c0,0.546,0.442,0.988,0.988,0.988h16.827
+		c0.546,0,0.988-0.442,0.988-0.988v-80.434c0-0.546-0.442-0.988-0.988-0.988H61.512c-0.546,0-0.988,0.442-0.988,0.988v31.381
+		C60.524,461.339,60.082,461.782,59.536,461.782z"/>
+	<path style="fill:#C2C2C4;" d="M153.458,477.816c0,14.541-4.452,20.596-19.987,20.596c-15.53,0-20.12-6.055-20.12-20.596v-48.397
+		c0-0.546-0.442-0.988-0.988-0.988h-16.65c-0.546,0-0.988,0.442-0.988,0.988v48.818c0,10.453,0.976,17.705,5.077,22.129
+		c7.291,8.093,18.139,11.35,33.67,11.35c15.535,0,26.177-3.258,33.523-11.35c3.992-4.33,5.238-11.593,5.238-22.129v-48.818
+		c0-0.546-0.442-0.988-0.988-0.988h-16.798c-0.546,0-0.988,0.442-0.988,0.988L153.458,477.816L153.458,477.816z"/>
+	<path style="fill:#C2C2C4;" d="M213.393,429.001l-36.865,80.434c-0.3,0.655,0.178,1.4,0.898,1.4h17.663
+		c0.403,0,0.765-0.244,0.916-0.617l7.448-18.384c0.151-0.373,0.513-0.617,0.916-0.617h37.412c0.398,0,0.758,0.239,0.912,0.607
+		l7.707,18.405c0.154,0.367,0.513,0.607,0.912,0.607h18.692c0.721,0,1.199-0.747,0.897-1.402L233.81,429
+		c-0.161-0.35-0.512-0.574-0.897-0.574h-18.622C213.905,428.424,213.554,428.649,213.393,429.001z M210.351,475.162l11.599-28.097
+		c0.334-0.809,1.478-0.817,1.822-0.011l12.01,28.097c0.279,0.652-0.2,1.377-0.909,1.377h-23.609
+		C210.561,476.528,210.083,475.813,210.351,475.162z"/>
+	<path style="fill:#C2C2C4;" d="M359.231,488.744l-18.807-59.629c-0.13-0.411-0.511-0.691-0.943-0.691H318.83
+		c-0.445,0-0.835,0.298-0.953,0.727l-16.309,59.458c-0.259,0.946-1.589,0.977-1.893,0.045l-19.405-59.548
+		c-0.133-0.407-0.512-0.682-0.94-0.682h-18.01c-0.685,0-1.162,0.679-0.93,1.324l29.007,80.434c0.141,0.392,0.513,0.653,0.93,0.653
+		h21.399c0.447,0,0.838-0.299,0.954-0.73l15.543-57.503c0.258-0.956,1.606-0.98,1.898-0.034l17.786,57.571
+		c0.128,0.414,0.511,0.697,0.944,0.697h21.573c0.425,0,0.803-0.272,0.937-0.675l26.878-80.434c0.214-0.64-0.262-1.301-0.937-1.301
+		h-17.111c-0.435,0-0.819,0.285-0.946,0.701l-18.125,59.609C360.836,489.663,359.523,489.67,359.231,488.744z"/>
+	<path style="fill:#C2C2C4;" d="M402.713,471.136c0,14.921,4.468,25.728,13.659,32.462c8.689,6.407,17.017,7.237,27.82,7.237h30.686
+		c0.546,0,0.988-0.442,0.988-0.988v-12.361c0-0.546-0.442-0.988-0.988-0.988h-29.804c-14.416,0-20.814-5.181-21.221-19.186
+		c-0.016-0.554,0.437-1.015,0.992-1.015h50.033c0.546,0,0.988-0.442,0.988-0.988v-12.401c0-0.546-0.442-0.988-0.988-0.988h-49.849
+		c-0.576,0-1.04-0.496-0.989-1.07c1.081-12.199,7.864-18.048,21.034-18.048h29.804c0.546,0,0.988-0.442,0.988-0.988v-12.401
+		c0-0.546-0.442-0.988-0.988-0.988h-30.19C415.998,428.424,402.713,442.015,402.713,471.136z"/>
+	<path style="fill:#C2C2C4;" d="M492.415,429.412v80.428c0,0.546,0.442,0.988,0.988,0.988h17.609c0.546,0,0.988-0.442,0.988-0.988
+		v-80.428c0-0.546-0.442-0.988-0.988-0.988h-17.609C492.857,428.424,492.415,428.867,492.415,429.412z"/>
+</g>
+<path style="fill:#D84848;" d="M71.37,343.942h-0.004c-0.053-0.083-0.954-1.276-1.754-2.85c-0.079-0.133-0.161-0.264-0.24-0.396
+	c-0.119-0.2-0.188-0.408-0.233-0.618c-0.424-1.003-0.741-2.085-0.765-3.101l-18.63,0.651c-1.542,0.054-2.452,1.742-1.663,3.068
+	c17.14,28.841,44.788,50.626,73.545,43.929C101.993,380.177,84.116,364.049,71.37,343.942z"/>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>