summaryrefslogtreecommitdiffstats
path: root/wiki/src/support.fa.po
diff options
context:
space:
mode:
authorsajolida <sajolida@pimienta.org>2015-12-23 15:33:27 +0000
committersajolida <sajolida@pimienta.org>2015-12-23 15:33:27 +0000
commitc27c192b60870f7a584d492e143c3a9c79ff546f (patch)
treef2a4395e4cd5fc9f08e69033832bae5976e4165c /wiki/src/support.fa.po
parent4c95bb2434c3d85a9a8c8ae14104a66afb4cd264 (diff)
Fix badly resolved conflicts
Diffstat (limited to 'wiki/src/support.fa.po')
-rw-r--r--wiki/src/support.fa.po154
1 files changed, 0 insertions, 154 deletions
diff --git a/wiki/src/support.fa.po b/wiki/src/support.fa.po
index bf4b4b7..48001e0 100644
--- a/wiki/src/support.fa.po
+++ b/wiki/src/support.fa.po
@@ -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:02+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,49 +18,22 @@ 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=\"Support\"]]\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "[[!meta title=\"پشتیبانی\"]]\n"
->>>>>>> web/10400-farsi-only
#. type: Title =
#, no-wrap
msgid "Search the documentation\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "در مستندات جستجو کنید\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
msgid ""
"Read the [[official documentation|doc]] to learn more about how Tails works "
"and maybe start answering your questions. It contains:"
msgstr ""
-<<<<<<< HEAD
-
-#. type: Bullet: ' - '
-msgid "General information about what Tails is"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid "Information to understand how it can help you and what its limitations are"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid "Guides covering typical uses of Tails"
-msgstr ""
-
-#. type: Plain text
-msgid "[[Visit Tails documentation|doc]]"
-msgstr ""
-=======
"برای کسب اطلاعات بیشتر در مورد این که تور چگونه کار می‌کند و شاید برای گرفتن "
"پاسخ سوال‌هایتان به صفحهٔ [[سندهای رسمی|doc]] مراجعه کنید. محتویات این سند "
"عبارتند از:"
@@ -96,55 +55,29 @@ msgstr "راهنمای استفاده معمولی از تیلز"
#. type: Plain text
msgid "[[Visit Tails documentation|doc]]"
msgstr "[[سندهای تیلز را مشاهده کنید|doc]]"
->>>>>>> web/10400-farsi-only
#. type: Title =
#, no-wrap
msgid "Learn how to use Tails\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "چطور می‌توان از تیلز استفاده کرد\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"support/learn/intro.inline\" raw=\"yes\"]]\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "[[!inline pages=\"support/learn/intro.inline\" raw=\"yes\"]]\n"
->>>>>>> web/10400-farsi-only
#. type: Title =
#, no-wrap
msgid "Frequently asked questions\n"
-<<<<<<< HEAD
-msgstr ""
-
-#. type: Plain text
-msgid "Search our list of [[frequently asked questions|faq]]."
-msgstr ""
-=======
msgstr "سوالات متداول\n"
#. type: Plain text
msgid "Search our list of [[frequently asked questions|faq]]."
msgstr "جستجو در فهرست [[سوالات متداول|faq]] ما."
->>>>>>> web/10400-farsi-only
#. type: Title =
#, no-wrap
msgid "Upgrade\n"
-<<<<<<< HEAD
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"Make sure you are using the latest version, as "
-"[[upgrading|doc/first_steps/upgrade]] might solve your problem."
-msgstr ""
-=======
msgstr "ارتقاء\n"
#. type: Plain text
@@ -154,32 +87,10 @@ msgid ""
msgstr ""
"مطمئن شوید آخرین نسخه را استفاده می‌کنید؛ [[ارتقاء|doc/first_steps/upgrade]] "
"ممکن است مشکل شما را حل کند."
->>>>>>> web/10400-farsi-only
#. type: Title =
#, no-wrap
msgid "Check if the problem is already known\n"
-<<<<<<< HEAD
-msgstr ""
-
-#. type: Plain text
-msgid "You can have a look at:"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid "The [[list of known issues|support/known_issues]]"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid "The [[list of things to do|todo]]"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid ""
-"The [list of things that will be in the next "
-"release](https://labs.riseup.net/code/projects/tails/issues?query_id=111)"
-msgstr ""
-=======
msgstr "بررسی کنید که آیا مشکل شناخته شده است یا نه\n"
#. type: Plain text
@@ -201,93 +112,55 @@ msgid ""
msgstr ""
"[فهرست چیزهایی که در نسخهٔ بعدی اضافه خواهند "
"شد](https://labs.riseup.net/code/projects/tails/issues?query_id=111)"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "<div id=\"page-found_a_problem\">\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "<div id=\"page-found_a_problem\">\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "<div id=\"bugs\">\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "<div id=\"bugs\">\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid " <h1>Report an error</h1>\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr " <h1>یک ایراد را گزارش دهید</h1>\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid ""
-<<<<<<< HEAD
-" <p>If you are facing an error in Tails, please follow the [[bug "
-"reporting\n"
-" guidelines|doc/first_steps/bug_reporting]].</p>\n"
-msgstr ""
-=======
" <p>If you are facing an error in Tails, please follow the [[bug reporting\n"
" guidelines|doc/first_steps/bug_reporting]].</p>\n"
msgstr ""
" <p>اگر در تیلز با مشکلی مواجه شدید، لطفاً قسمت [[دستورالعمل گزارش ایرادها\n"
"   |doc/first_steps/bug_reporting]] را مطالعه کنید.</p>\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid ""
" <p>If Tails does not start, please see our specific\n"
-<<<<<<< HEAD
-" [[reporting "
-"guidelines|doc/first_steps/bug_reporting/tails_does_not_start]].</p>\n"
-msgstr ""
-=======
" [[reporting guidelines|doc/first_steps/bug_reporting/tails_does_not_start]].</p>\n"
msgstr ""
" <p>اگر تیلز راه‌اندازی نشد، لطفاً بخش خاص\n"
" [[دستورالمل‌های گزارش|doc/first_steps/bug_reporting/tails_does_not_start]] "
"ما را بخوانید.</p>\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "</div> <!-- #bugs -->\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "</div> <!-- #bugs -->\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "<div id=\"wishlist\">\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "<div id=\"wishlist\">\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid " <h1>Request a feature</h1>\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr " <h1>درخواست یک ویژگی</h1>\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
@@ -296,63 +169,36 @@ msgid ""
" search the [[!tails_redmine desc=\"open tickets in Redmine\"]] first,\n"
" and file a new ticket in there if no existing one matches your needs.\n"
msgstr ""
-<<<<<<< HEAD
-=======
" اگر دوست دارید ویژگی جدیدی در تیلز ببینید\n"
" ابتدا در [[!tails_redmine desc=\"درخواست جدیدی در ردماین\"]] جستجو کنید\n"
" و اگر نمونه‌ای مشابه نمونهٔ موردنیاز شما نبود، درخواست جدیدی ارائه دهید.\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "</div> <!-- #wishlist -->\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "</div> <!-- #wishlist -->\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "</div> <!-- #page-found_a_problem -->\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "</div> <!-- #page-found_a_problem -->\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "<div id=\"talk\">\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "<div id=\"talk\">\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid " <h1>Get in touch with us</h1>\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr " <h1>با ما تماس بگیرید</h1>\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid " [[!inline pages=\"support/talk\" raw=\"yes\"]]\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr " [[!inline pages=\"support/talk\" raw=\"yes\"]]\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "</div> <!-- #talk -->\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "</div> <!-- #talk -->\n"
->>>>>>> web/10400-farsi-only