Improve Persian translation

locale/.vs/VSWorkspaceState.json

@@ -0,0 +1,6 @@
+{
+  "ExpandedNodes": [
+    ""
+  ],
+  "PreviewInSolutionExplorer": false
+}

locale/fa/blog/index.md

@@ -0,0 +1,4 @@
+---
+layout: blog-index.hbs
+paginate: blog
+---

locale/fa/blog/nodejs-road-ahead.md

@@ -0,0 +1,54 @@
+---
+title: Node.js and the Road Ahead
+date: 2014-01-16T23:00:00.000Z
+author: Timothy J Fontaine
+slug: nodejs-road-ahead
+layout: blog-post.hbs
+---
+As the new project lead for Node.js I am excited for our future, and want to
+give you an update on where we are.
+
+One of Node's major goals is to provide a small core, one that provides the
+right amount of surface area for consumers to achieve and innovate, without
+Node itself getting in the way. That ethos is alive and well, we're going to
+continue to provide a small, simple, and stable set of APIs that facilitate the
+amazing uses the community finds for Node. We're going to keep providing
+backward compatible APIs, so code you write today will continue to work on
+future versions of Node. And of course, performance tuning and bug fixing will
+always be an important part of every release cycle.
+
+The release of Node v0.12 is imminent, and a lot of significant work has gone
+into this release. There's streams3, a better keep alive agent for http, the vm
+module is now based on contextify, and significant performance work done in
+core features (Buffers, TLS, streams). We have a few APIs that are still being
+ironed out before we can feature freeze and branch (execSync, AsyncListeners,
+user definable instrumentation). We are definitely in the home stretch.
+
+But Node is far from done. In the short term there will be new releases of v8
+that we'll need to track, as well as integrating the new ABI stable C module
+interface. There are interesting language features that we can use to extend
+Node APIs (extend not replace). We need to write more tooling, we need to
+expose more interfaces to further enable innovation. We can explore
+functionality to embed Node in your existing project.
+
+The list can go on and on. Yet, Node is larger than the software itself. Node
+is also the community, the businesses, the ecosystems, and their related
+events. With that in mind there are things we can work to improve. 
+
+The core team will be improving its procedures such that we can quickly and
+efficiently communicate with you. We want to provide high quality and timely
+responses to issues, describe our development roadmap, as well as provide our
+progress during each release cycle. We know you're interested in our plans for
+Node, and it's important we're able to provide that information. Communication
+should be bidirectional: we want to continue to receive feedback about how
+you're using Node, and what your pain points are.
+
+After the release of v0.12 we will facilitate the community to contribute and
+curate content for nodejs.org. Allowing the community to continue to invest in
+Node will ensure nodejs.org is an excellent starting point and the primary
+resource for tutorials, documentation, and materials regarding Node. We have an
+awesome and engaged community, and they're paramount to our success. 
+
+I'm excited for Node's future, to see new and interesting use cases, and to
+continue to help businesses scale and innovate with Node. We have a lot we can
+accomplish together, and I look forward to seeing those results.

locale/fa/docs/index.md

@@ -24,7 +24,10 @@ This documentation describes the built-in modules provided by Node.js. It does n
 
   <ul>
     <li><a href="https://nodejs.org/docs/latest-v9.x/api/">Node.js 9.x</a></li>
+<<<<<<< HEAD
+=======
     <li><a href="https://nodejs.org/docs/latest-v8.x/api/">Node.js 8.x</a></li>
+>>>>>>> upstream/master
     <li><a href="https://nodejs.org/docs/latest-v7.x/api/">Node.js 7.x</a></li>
     <li><a href="https://nodejs.org/docs/latest-v6.x/api/">Node.js 6.x</a></li>
     <li><a href="https://nodejs.org/docs/latest-v5.x/api/">Node.js 5.x</a></li>

locale/fa/download/index.md

@@ -1,6 +1,6 @@
 ---
 layout: download.hbs
-title: Download
+title: دانلود
 download: Download
 downloads:
     headline: Downloads
@@ -10,15 +10,15 @@ downloads:
     tagline-lts: Recommended For Most Users
     display-hint: Display downloads for
     intro: >
-        Download the Node.js source code or a pre-built installer for your platform, and start developing today.
-    currentVersion: Latest LTS Version
+        کدهای منبع یا نصب‌کنندهٔ نسخهٔ پیش‌ساختهٔ نودجی‌اس را برای پلتفرم خود دریافت و همین امروز کار را شروع کنید.
+    currentVersion: آخرین انتشار با پشتیبانی طولانی
     buildInstructions: Building Node.js from source on supported platforms
     WindowsInstaller: Windows Installer
     WindowsBinary: Windows Binary
     MacOSInstaller: macOS Installer
     MacOSBinary: macOS Binary
-    LinuxBinaries: Linux Binaries
-    SourceCode: Source Code
+    LinuxBinaries: باینری لینوکس
+    SourceCode: کدهای منبع
 additional:
     headline: Additional Platforms
     intro: >

locale/fa/index.md

@@ -7,18 +7,18 @@ labels:
   download-for: دانلود برای
   other-downloads: سایر دانلود‌ها
   other-lts-downloads: سایر دانلود‌های با پشتیبانی طولانی
-  other-current-downloads: سایر دانلودهای جاری
-  current: جاری
-  lts: پشتیبانی طولانی مدت
+  other-current-downloads: سایر دانلودهای کنونی
+  current: نگارش کنونی
+  lts: نگارش با پشتیبانی طولانی مدت
   tagline-current: آخرین ویژگی‌ها
   tagline-lts: پیشنهاد شده برای بیشتر کاربران
   changelog: گزارش تغییرات
   api: مستندات API
   version-schedule-prompt: یا نگاهی بیاندازید به
-  version-schedule-prompt-link-text: زمان بندی پشتیبانی طولانی مدت
-  newsletter: درست
+  version-schedule-prompt-link-text: زمان‌بندی پشتیبانی طولانی مدت
+  newsletter: بله
   newsletter-prefix: نام‌نویسی برای
-  newsletter-postfix: "، خبرنامهٔ رسمی NodeJs.org"
+  newsletter-postfix: "، خبرنامهٔ رسمی نودجی‌اس"
 ---
 
-Node.js® is a JavaScript runtime built on [Chrome's V8 JavaScript engine](https://developers.google.com/v8/).
+Node.js® یک ابزار جاوااسکریپ بر مبنای  موتور جاوااسکریپت کروم [Chrome V8](https://developers.google.com/v8/) است.

locale/fa/site.json

@@ -1,9 +1,14 @@
 {
   "title": "Node.js",
   "author": "Node.js Foundation",
+<<<<<<< HEAD
+  "url": "https://nodejs.org/en/",
+  "locale": "en",
+=======
   "url": "https://nodejs.org/fa/",
   "locale": "fa",
   "rtl": true,
+>>>>>>> upstream/master
   "scrollToTop": "Scroll to top",
   "reportNodeIssue": "Report Node.js issue",
   "reportWebsiteIssue": "Report website issue",
@@ -17,7 +22,7 @@
   "feeds": [
     {
       "link": "feed/blog.xml",
-      "text": "وبلاگ نودجی‌اس"
+      "text": "بلاگ نودجی‌اس"
     },
     {
       "link": "feed/releases.xml",
@@ -33,14 +38,14 @@
   },
   "about": {
     "link": "about",
-    "text": "دربارهٔ...",
+    "text": "دربارهٔ ما...",
     "governance": {
       "link": "about/governance",
       "text": "مدیریت"
     },
     "community": {
       "link": "about/community",
-      "text": "اجتماع"
+      "text": "جامعه"
     },
     "workinggroups": {
       "link": "about/working-groups",
@@ -60,7 +65,7 @@
     },
     "privacy": {
       "link": "about/privacy",
-      "text": "سیاست‌های حریم شخصی"
+      "text": "سیاست‌های حریم خصوصی"
     }
   },
   "download": {
@@ -72,7 +77,7 @@
     },
     "package-manager": {
       "link": "download/package-manager",
-      "text": "نصب نودجی‌اس با package manager"
+      "text": "نصب نودجی‌اس با پکیج‌منیجر"
     },
     "shasums": {
       "link": "SHASUMS256.txt.asc",
@@ -86,7 +91,7 @@
     "text": "اسناد",
     "es6": {
       "link": "docs/es6",
-      "text": "ES6 و فراتر"
+      "text": "اکمااسکریپت ۶ و فراتر"
     },
     "api-lts": {
       "link": "/dist/latest-%ver-major%/docs/api",
@@ -119,7 +124,7 @@
     },
     "contribute": {
       "link": "get-involved/contribute",
-      "text": "Contribute"
+      "text": "مشارکت‌ جستن"
     },
     "conduct": {
       "link": "https://github.com/nodejs/node/blob/master/CONTRIBUTING.md#code-of-conduct",