Commit c27c192b authored by sajolida's avatar sajolida

Fix badly resolved conflicts

parent 4c95bb24
......@@ -3,20 +3,6 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
<<<<<<< HEAD
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-12-23 15:01+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
=======
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
......@@ -32,16 +18,11 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Weblate 2.4-dev\n"
>>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"About\"]]\n"
<<<<<<< HEAD
msgstr ""
=======
msgstr "[[!meta title=\"درباره\"]]\n"
>>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
......@@ -49,11 +30,8 @@ msgid ""
"> **amnesia**, *noun*:<br/>\n"
"> forgetfulness; loss of long-term memory.\n"
msgstr ""
<<<<<<< HEAD
=======
"> **فراموشی**, *اسم*:<br/>\n"
">نسیان؛ از دست رفتن حافظهٔ بلندمدت.\n"
>>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
......@@ -61,11 +39,8 @@ msgid ""
"> **incognito**, *adjective & adverb*:<br/>\n"
"> (of a person) having one's true identity concealed.\n"
msgstr ""
<<<<<<< HEAD
=======
"> **ناشناس**, *صفت و قید*:<br/>\n"
"> شخصی که هویت واقعی خود را پنهان کند.\n"
>>>>>>> web/10400-farsi-only
#. type: Plain text
msgid ""
......@@ -74,13 +49,10 @@ msgid ""
"anywhere you go and on any computer but leaving no trace unless you ask it "
"to explicitly."
msgstr ""
<<<<<<< HEAD
=======
"تیلز یک سرویس زنده است که هدف آن حفظ حریم خصوصی و مخفی ماندن هویت شما است. "
"این سرویس به شما کمک می‌کند که همه جا و روی هر رایانه‌ای به صورت ناشناس از "
"اینترنت استفاده کرده و سانسور را دور بزنید، بدون اینکه اثری از خود به جا "
"بگذارید، مگر آن‌که مشخصاً قصد به جا گذاشتن اثری از خود داشته باشید."
>>>>>>> web/10400-farsi-only
#. type: Plain text
msgid ""
......@@ -89,13 +61,10 @@ msgid ""
"[[Free Software|doc/about/license]] and based on [[Debian "
"GNU/Linux|https://www.debian.org/]]."
msgstr ""
<<<<<<< HEAD
=======
"این سیستم عامل، مستقل از سیستم عامل اولیهٔ رایانه طراحی شده و با دی‌وی‌دی، "
"درایو یو‌اس‌بی، و کارت اس‌دی قابل استفاده است. تیلز یک [[نرم‌افزار "
"آزاد|doc/about/license]] و مبتنی بر [[دبیان "
"گنو/لینوکس|https://www.debian.org/]] است."
>>>>>>> web/10400-farsi-only
#. type: Plain text
msgid ""
......@@ -103,39 +72,24 @@ msgid ""
"in mind: web browser, instant messaging client, email client, office suite, "
"image and sound editor, etc."
msgstr ""
<<<<<<< HEAD
=======
"تیلز دارای ابزارهای پیش‌فرض بسیاری است که مسالهٔ امنیت را جدی گرفته‌اند، از "
"جمله مرورگر وب، نرم‌افزار پیغام کوتاه، نرم‌افزار رایانامه، مجموعهٔ آفیس، "
"ویرایش‌گر تصویر و صدا و غیره."
>>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "[[!toc levels=2]]\n"
<<<<<<< HEAD
msgstr ""
=======
msgstr "[[!toc levels=2]]\n"
>>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "<a id=\"tor\"></a>\n"
<<<<<<< HEAD
msgstr ""
=======
msgstr "<a id=\"tor\"></a>\n"
>>>>>>> web/10400-farsi-only
#. type: Title =
#, no-wrap
msgid "Online anonymity and censorship circumvention\n"
<<<<<<< HEAD
msgstr ""
=======
msgstr "ناشناس ماندن آنلاین و دور زدن سانسور\n"
>>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
......@@ -143,64 +97,24 @@ msgid ""
"Tor\n"
"---\n"
msgstr ""
<<<<<<< HEAD
#. type: Plain text
msgid "Tails relies on the Tor anonymity network to protect your privacy online:"
msgstr ""
=======
"تور\n"
"---\n"
#. type: Plain text
msgid "Tails relies on the Tor anonymity network to protect your privacy online:"
msgstr "تیلز برای حفظ حریم خصوصی شما از شبکهٔ ناشناسی تور استفاده می‌کند:"
>>>>>>> web/10400-farsi-only
#. type: Bullet: ' - '
msgid "all software is configured to connect to the Internet through Tor"
msgstr ""
<<<<<<< HEAD
=======
"تمام نرم‌افزارها به صورتی پیکربندی شده‌اند که از طریق تور به اینترنت متصل "
"شوند"
>>>>>>> web/10400-farsi-only
#. type: Bullet: ' - '
msgid ""
"if an application tries to connect to the Internet directly, the connection "
"is automatically blocked for security."
msgstr ""
<<<<<<< HEAD
#. type: Plain text
msgid ""
"Tor is an open and distributed network that helps defend against traffic "
"analysis, a form of network surveillance that threatens personal freedom and "
"privacy, confidential business activities and relationships, and state "
"security."
msgstr ""
#. type: Plain text
msgid ""
"Tor protects you by bouncing your communications around a network of relays "
"run by volunteers all around the world: it prevents somebody watching your "
"Internet connection from learning what sites you visit, and it prevents the "
"sites you visit from learning your physical location."
msgstr ""
#. type: Plain text
msgid "Using Tor you can:"
msgstr ""
#. type: Bullet: ' - '
msgid "be anonymous online by hiding your location,"
msgstr ""
#. type: Bullet: ' - '
msgid "connect to services that would be censored otherwise;"
msgstr ""
=======
"اگر اپلیکشنی بخواهد به صورت مستقیم به اینترنت متصل شود، این ارتباط به دلایل "
"امنیتی به شکل خودکار مسدود می‌شود."
......@@ -240,77 +154,51 @@ msgstr "با مخفی کردن موقعیت خود به صورت ناشناس آ
#. type: Bullet: ' - '
msgid "connect to services that would be censored otherwise;"
msgstr "به سرویس‌هایی متصل شوید که سانسور شده‌اند؛"
>>>>>>> web/10400-farsi-only
#. type: Bullet: ' - '
msgid ""
"resist attacks that block the usage of Tor using circumvention tools such as "
"[[bridges|doc/first_steps/startup_options/bridge_mode]]."
msgstr ""
<<<<<<< HEAD
=======
"مقابل حملاتی که با استفاده از ابزارهای فیلترشکن مانند "
"[[پل‌ها|doc/first_steps/startup_options/bridge_mode]] مانع از استفاده تور می‌"
"شوند مقاومت کنید."
>>>>>>> web/10400-farsi-only
#. type: Plain text
msgid ""
"To learn more about Tor, see the official [Tor "
<<<<<<< HEAD
"website](https://www.torproject.org/), particularly the following pages:"
msgstr ""
=======
"website](https://www.torproject.org/):"
msgstr ""
"برای این‌که بیشتر با تور آشنا شوید، به [تارنمای رسمی "
"تور](https://www.torproject.org/) مراجعه کنید:"
>>>>>>> web/10400-farsi-only
#. type: Bullet: '- '
msgid ""
"[Tor overview: Why we need "
"Tor](https://www.torproject.org/about/overview.html.en#whyweneedtor)"
msgstr ""
<<<<<<< HEAD
=======
"[مروری بر تور: چرا به تو احتیاج "
"داریم؟](https://www.torproject.org/about/overview.html.en#whyweneedtor)"
>>>>>>> web/10400-farsi-only
#. type: Bullet: '- '
msgid ""
"[Tor overview: How does Tor "
"work](https://www.torproject.org/about/overview.html.en#thesolution)"
msgstr ""
<<<<<<< HEAD
=======
"[مروری بر تور: تور چگونه کار "
"می‌کند؟](https://www.torproject.org/about/overview.html.en#thesolution)"
>>>>>>> web/10400-farsi-only
#. type: Bullet: '- '
msgid "[Who uses Tor?](https://www.torproject.org/about/torusers.html.en)"
msgstr ""
<<<<<<< HEAD
=======
"[چه کسی از تور استفاده "
"می‌کند؟](https://www.torproject.org/about/torusers.html.en)"
>>>>>>> web/10400-farsi-only
#. type: Bullet: '- '
msgid ""
"[Understanding and Using Tor — An Introduction for the "
"Layman](https://trac.torproject.org/projects/tor/wiki/doc/TorALaymansGuide)"
msgstr ""
<<<<<<< HEAD
#. type: Plain text
msgid ""
"To learn more about how Tails ensures all its network connections use Tor, "
"see our [[design document|contribute/design/Tor_enforcement]]."
msgstr ""
=======
"[آشنایی با تور و استفاده از آن — مقدمه‌ای برای کاربر "
"مبتدی](https://trac.torproject.org/projects/tor/wiki/doc/TorALaymansGuide)"
......@@ -321,7 +209,6 @@ msgid ""
msgstr ""
"برای آن‌که بیشتر با نحوهٔ کار تور آشنا شوید [[سند "
"طراحی|contribute/design/Tor_enforcement]] را بخوانید."
>>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
......@@ -329,72 +216,47 @@ msgid ""
"I2P\n"
"---\n"
msgstr ""
<<<<<<< HEAD
=======
"I2P\n"
"---\n"
>>>>>>> web/10400-farsi-only
#. type: Plain text
msgid ""
"You can also use Tails to access [I2P](https://geti2p.net) which is an "
"anonymity network different from Tor."
msgstr ""
<<<<<<< HEAD
=======
"همچنین می‌توانید از تیلز برای دسترسی به [I2P](https://geti2p.net) که یک "
"شبکهٔ متفاوت از تور برای ناشناس ماندن است استفاده کنید."
>>>>>>> web/10400-farsi-only
#. type: Plain text
msgid ""
"[[Learn how to use I2P in Tails in the "
"documentation.|doc/anonymous_internet/i2p]]"
msgstr ""
<<<<<<< HEAD
=======
"[[برای یادگیری نحوهٔ استفاده از I2P در تیلز به بخش مستندات مراجعه "
"کنید.|doc/anonymous_internet/i2p]]"
>>>>>>> web/10400-farsi-only
#. type: Plain text
msgid ""
"To know how I2P is implemented in Tails, see our [[design "
"document|contribute/design/I2P]]."
msgstr ""
<<<<<<< HEAD
=======
"برای آشنایی با نحوهٔ اجرای I2P در تیلز [[سند طراحی|contribute/design/I2P]] "
"ما را ببینید."
>>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "<a id=\"amnesia\"></a>\n"
<<<<<<< HEAD
msgstr ""
=======
msgstr "<a id=\"فراموشی\"></a>\n"
>>>>>>> web/10400-farsi-only
#. type: Title =
#, no-wrap
msgid "Use anywhere but leave no trace\n"
<<<<<<< HEAD
msgstr ""
=======
msgstr "همه‌جا استفاده کنید، اما اثری به جا نگذارید.\n"
>>>>>>> web/10400-farsi-only
#. type: Plain text
msgid ""
"Using Tails on a computer doesn't alter or depend on the operating system "
"installed on it. So you can use it in the same way on your computer, a "
<<<<<<< HEAD
"friend's computer, or one at your local library. After shutting down Tails, "
"the computer will start again with its usual operating system."
msgstr ""
=======
"friend's or one at your local library. After shutting down Tails, the "
"computer can start again on its usual operating system."
msgstr ""
......@@ -402,26 +264,11 @@ msgstr ""
"آن را تغییر نمی‌دهد. بنابراین می‌توانید از آن روی رایانه‌ٔ خودتان، دوستتان، "
"یا کتاب‌خانه استفاده کنید. بعد از بستن تیلز، رایانه می‌تواند با سیستم عامل "
"خودش دوباره شروع به کار کند."
>>>>>>> web/10400-farsi-only
#. type: Plain text
msgid ""
"Tails is configured with special care to not use the computer's hard-disks, "
"even if there is some swap space on them. The only storage space used by "
<<<<<<< HEAD
"Tails is in RAM, which is automatically erased when the computer shuts "
"down. So you won't leave any trace on the computer either of the Tails "
"system itself or what you used it for. That's why we call Tails \"amnesic\"."
msgstr ""
#. type: Plain text
msgid ""
"This allows you to work with sensitive documents on any computer and "
"protects you from data recovery after shutdown. Of course, you can still "
"explicitly save specific documents to another USB stick or external "
"hard-disk and take them away for future use."
msgstr ""
=======
"Tails is the RAM, which is automatically erased when the computer shuts "
"down. So you won't leave any trace neither of the Tails system nor of what "
"you did on the computer. That's why we call it \"amnesic\"."
......@@ -443,36 +290,24 @@ msgstr ""
"شما در مقابل بازیابی داده‌ها بعد از خاموش کردن رایانه محافظت می‌کند. البته "
"می‌توانید به اختیار خود بعضی مستندات را روی یک درایو یو‌اس‌بی یا سخت‌دیسک "
"خارجی ذخیره کنید."
>>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "<a id=\"cryptography\"></a>\n"
<<<<<<< HEAD
msgstr ""
=======
msgstr "<a id=\"رمزنگاری\"></a>\n"
>>>>>>> web/10400-farsi-only
#. type: Title =
#, no-wrap
msgid "State-of-the-art cryptographic tools\n"
<<<<<<< HEAD
msgstr ""
=======
msgstr "بهترین ابزارهای رمزنگاری\n"
>>>>>>> web/10400-farsi-only
#. type: Plain text
msgid ""
"Tails also comes with a selection of tools to protect your data using strong "
"encryption:"
msgstr ""
<<<<<<< HEAD
=======
"تیلز همچنین دارای مجموعه‌ای از ابزارها است که با استفاده از رمزنگاری قوی از "
"داده‌های شما محافظت می‌کنند:"
>>>>>>> web/10400-farsi-only
#. type: Bullet: ' - '
msgid ""
......@@ -481,12 +316,6 @@ msgid ""
"class=\"definition\">[[!wikipedia LUKS]]</span>, the Linux standard for "
"disk-encryption."
msgstr ""
<<<<<<< HEAD
#. type: Bullet: ' - '
msgid ""
"Automatically use HTTPS to encrypt all your communications to a number of "
=======
"با استفاده از <span class=\"definition\">[[!wikipedia LUKS]]</span> یعنی "
"استاندارد لینوکس برای رمزنگاری دیسک‌ها، [[درایوهای یواس‌بی یا سخت‌دیسک‌های "
"خارجی خود را رمزگذاری کنید|doc/encryption_and_privacy/encrypted_volumes]]."
......@@ -494,18 +323,14 @@ msgid ""
#. type: Bullet: ' - '
msgid ""
"Automatically encrypt with HTTPS all your communications to a number of "
>>>>>>> web/10400-farsi-only
"major websites using [HTTPS "
"Everywhere](https://www.eff.org/https-everywhere), a Firefox extension "
"developed by the [Electronic Frontier Foundation](https://www.eff.org)."
msgstr ""
<<<<<<< HEAD
=======
"تمام ارتباطاتتان را به صورت خودکار به HTTPS منتقل کنید. برای این کار از ["
"HTTPS Everywhere](https://www.eff.org/https-everywhere)، استفاده کنید؛ "
"افزونه‌ای که توسط موسسهٔ [Electronic Frontier "
"Foundation](https://www.eff.org) ایجاد شده‌است."
>>>>>>> web/10400-farsi-only
#. type: Bullet: ' - '
msgid ""
......@@ -513,13 +338,10 @@ msgid ""
"<span class=\"definition\">[[!wikipedia OpenPGP]]</span> either from Tails "
"email client, text editor or file browser."
msgstr ""
<<<<<<< HEAD
=======
"رایانامه‌ها و مستندات خود را با استفاده از استاندارد *غیررسمی (دفاکتو)* <"
"span class=\"definition\">[[!wikipedia OpenPGP]]</span> رمزگذاری کنید. برای "
"این‌ کار می‌توانید از سرویس رایانامه، ویرایش‌گر متن و یا مرورگر فایل تیلز "
"استفاده کنید."
>>>>>>> web/10400-farsi-only
#. type: Bullet: ' - '
msgid ""
......@@ -528,12 +350,9 @@ msgid ""
"desc=\"OTR\"]]</span>, a cryptographic tool that provides encryption, "
"authentication and deniability."
msgstr ""
<<<<<<< HEAD
=======
"مکالمات خصوصی خود را با استفاده از<span class=\"definition\">[[!wikipedia "
"Off-the-Record_Messaging desc=\"OTR\"]]</span> (یک ابزار رمزنگاری که امکان "
"رمزگذاری، احراز هویت و انکار را فراهم می‌کند) محافظت کنید."
>>>>>>> web/10400-farsi-only
#. type: Bullet: ' - '
msgid ""
......@@ -541,40 +360,21 @@ msgid ""
"and clean your diskspace using [[Nautilus "
"Wipe|http://wipetools.tuxfamily.org/nautilus-wipe.html]]."
msgstr ""
<<<<<<< HEAD
=======
"[[فایل‌های خود را به صورت امن "
"پاک|doc/encryption_and_privacy/secure_deletion]] و فضای دیسک خود را با "
"استفاده از [[پاک‌کن ناتیلوس|http://wipetools.tuxfamily.org/nautilus-"
"wipe.html]] خالی کنید."
>>>>>>> web/10400-farsi-only
#. type: Plain text
msgid ""
"[[Read more about those tools in the "
"documentation.|doc/encryption_and_privacy]]"
msgstr ""
<<<<<<< HEAD
=======
"[[دربارهٔ این ابزارها، در مستندات بیشتر بخوانید.|doc/encryption_and_privacy]]"
>>>>>>> web/10400-farsi-only
#. type: Title =
#, no-wrap
msgid "What's next?\n"
<<<<<<< HEAD
msgstr ""
#. type: Plain text
msgid "To continue discovering Tails, you can now read:"
msgstr ""
#. type: Bullet: ' - '
msgid ""
"the [[warning page|doc/about/warning]] to better understand the security "
"limitations of Tails and Tor,"
msgstr ""
=======
msgstr "دیگر چه؟\n"
#. type: Plain text
......@@ -588,35 +388,12 @@ msgid ""
msgstr ""