Skip to content

GitLab

T
tails
Commit c27c192b authored by sajolida's avatar sajolida
Browse files
Options

Fix badly resolved conflicts

parent 4c95bb24
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 30750 deletions
wiki/src/about.fa.po
View file @ c27c192b
This diff is collapsed.
wiki/src/bugs.fa.po
View file @ c27c192b
......@@ -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,35 +18,24 @@ 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=\"Bugs\"]]\n"
<<<<<<< HEAD
msgstr ""
=======
msgstr "[[!meta title=\"ایراد\"]]\n"
>>>>>>> web/10400-farsi-only
#. type: Plain text
msgid ""
"If you've found a bug in Tails, please read "
"[[doc/first_steps/bug_reporting]]."
msgstr ""
<<<<<<< HEAD
=======
"اگر ایرادی در تیلز پیدا کرده‌اید، این صفحه را بخوانید "
"[[doc/first_steps/bug_reporting]]."
>>>>>>> web/10400-farsi-only
#. type: Plain text
msgid ""
"We don't use this section anymore, see "
"[[contribute/working_together/Redmine]] instead."
msgstr ""
<<<<<<< HEAD
=======
"ما دیگر از این صفحه استفاده می‌کنیم, به جای آن به صفحه‌ی "
"[[contribute/working_together/Redmine]] بروید."
>>>>>>> web/10400-farsi-only
wiki/src/contribute.fa.po
View file @ c27c192b
This diff is collapsed.
wiki/src/contribute/how/donate.fa.po
View file @ c27c192b
......@@ -7,11 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2015-12-23 15:01+0100\n"
=======
"POT-Creation-Date: 2015-09-26 10:31+0200\n"
>>>>>>> web/10400-farsi-only
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -54,12 +50,8 @@ msgstr ""
#. type: Bullet: ' * '
msgid ""
"Crowdfunding campaign run by the American organization [Freedom of the Press "
<<<<<<< HEAD
"Foundation](https://pressfreedomfoundation.org/bundle/encryption-tools-journalists)."
=======
"Foundation](https://pressfreedomfoundation.org/bundle/encryption-tools-"
"journalists)."
>>>>>>> web/10400-farsi-only
msgstr ""
#. type: Plain text
......@@ -76,17 +68,9 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
<<<<<<< HEAD
" If you live in Europe, your donation might be tax-deductible. Check what "
"are\n"
" the precise conditions in your country, and [ask\n"
" Zwiebelfreunde](https://www.torservers.net/contact.html) for a "
"donation\n"
=======
" If you live in Europe, your donation might be tax-deductible. Check what are\n"
" the precise conditions in your country, and [ask\n"
" Zwiebelfreunde](https://www.torservers.net/contact.html) for a donation\n"
>>>>>>> web/10400-farsi-only
" receipt if you need one.\n"
msgstr ""
......@@ -95,26 +79,16 @@ msgid "[[Bitcoin|donate#bitcoin]]"
msgstr ""
#. type: Bullet: ' * '
<<<<<<< HEAD
msgid "[Flattr](https://flattr.com/submit/auto?user_id=tails_live&url=https://tails.boum.org&title=Tails)"
=======
msgid ""
"[Flattr](https://flattr.com/submit/auto?user_id=tails_live&url=https://tails."
"boum.org&title=Tails)"
>>>>>>> web/10400-farsi-only
msgstr ""
#. type: Bullet: ' * '
msgid ""
<<<<<<< HEAD
"If none of these methods suit you, consider [donating to the Tor "
"Project](https://www.torproject.org/donate/). They do great work, and also "
"support us financially."
=======
"If none of these methods suit you, consider [donating to the Tor Project]"
"(https://www.torproject.org/donate/). They do great work, and also support "
"us financially."
>>>>>>> web/10400-farsi-only
msgstr ""
#. type: Plain text
......@@ -133,13 +107,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
<<<<<<< HEAD
msgid ""
"You can send Bitcoins to **<a "
"href=\"bitcoin:1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2\">1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2</a>**.\n"
=======
msgid "You can send Bitcoins to **<a href=\"bitcoin:1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2\">1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2</a>**.\n"
>>>>>>> web/10400-farsi-only
msgstr ""
#. type: Plain text
......@@ -150,12 +118,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
<<<<<<< HEAD
"<p>Bitcoin is <a "
"href=\"https://bitcoin.org/en/faq#is-bitcoin-anonymous\">not\n"
=======
"<p>Bitcoin is <a href=\"https://bitcoin.org/en/faq#is-bitcoin-anonymous\">not\n"
>>>>>>> web/10400-farsi-only
"anonymous</a>.</p>\n"
msgstr ""
......@@ -196,13 +159,8 @@ msgstr ""
#. type: Plain text
msgid ""
<<<<<<< HEAD
"Please, use the euro (EUR) as currency as this makes accounting "
"easier. However, Paypal automatically converts it to your local currency."
=======
"Please, use the euro (EUR) as currency as this makes accounting easier. "
"However, Paypal automatically converts it to your local currency."
>>>>>>> web/10400-farsi-only
msgstr ""
#. type: Title ###
......@@ -213,41 +171,15 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
<<<<<<< HEAD
"<form action=\"https://www.paypal.com/cgi-bin/webscr\" method=\"post\" "
"target='_blank' class='donation'>\n"
"\t<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"/>\n"
"\t<input type=\"hidden\" name=\"business\" "
"value=\"donate@torservers.net\"/>\n"
"\t<input type=\"hidden\" name=\"item_name\" value=\"Tails recurring "
"donation\"/>\n"
=======
"<form action=\"https://www.paypal.com/cgi-bin/webscr\" method=\"post\" target='_blank' class='donation'>\n"
"\t<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"/>\n"
"\t<input type=\"hidden\" name=\"business\" value=\"donate@torservers.net\"/>\n"
"\t<input type=\"hidden\" name=\"item_name\" value=\"Tails recurring donation\"/>\n"
>>>>>>> web/10400-farsi-only
"\t<input type=\"hidden\" name=\"no_note\" value=\"1\"/>\n"
"\t<input type=\"hidden\" name=\"src\" value=\"1\"/>\n"
"\t<input type=\"hidden\" name=\"modify\" value=\"1\"/>\n"
"\t<input type=\"hidden\" name=\"t3\" value=\"M\"/>\n"
"\t<input name=\"lc\" type=\"hidden\" value=\"US\" />\n"
<<<<<<< HEAD
"\t<input type=\"radio\" name=\"a3\" value=\"5\" id=\"sub5\" "
"checked=\"checked\" /><label for=\"sub5\">5</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"10\" id=\"sub10\"/><label "
"for=\"sub10\">10</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"20\" id=\"sub20\"/><label "
"for=\"sub20\">20</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"50\" id=\"sub50\"/><label "
"for=\"sub50\">50</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"100\" id=\"sub100\"/><label "
"for=\"sub100\">100</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"250\" id=\"sub250\"/><label "
"for=\"sub250\">250</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"500\" id=\"sub500\"/><label "
"for=\"sub500\">500</label>\n"
=======
"\t<input type=\"radio\" name=\"a3\" value=\"5\" id=\"sub5\" checked=\"checked\" /><label for=\"sub5\">5</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"10\" id=\"sub10\"/><label for=\"sub10\">10</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"20\" id=\"sub20\"/><label for=\"sub20\">20</label>\n"
......@@ -255,7 +187,6 @@ msgid ""
"\t<input type=\"radio\" name=\"a3\" value=\"100\" id=\"sub100\"/><label for=\"sub100\">100</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"250\" id=\"sub250\"/><label for=\"sub250\">250</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"500\" id=\"sub500\"/><label for=\"sub500\">500</label>\n"
>>>>>>> web/10400-farsi-only
"\t<select name=\"currency_code\">\n"
"\t\t\t<option value='EUR'>EUR</option>\n"
"\t\t\t<option value='USD'>USD</option>\n"
......@@ -282,18 +213,9 @@ msgid ""
"\t\t\t<option value='THB'>THB</option>\n"
"\t</select>\n"
"\t<br/>\n"
<<<<<<< HEAD
"\t<input type=\"radio\" name=\"p3\" value=\"1\" id=\"sub_m\" "
"checked=\"checked\" /><label for=\"sub_m\">monthly</label>\n"
"\t<input type=\"radio\" name=\"p3\" value=\"3\" id=\"sub_q\"/><label "
"for=\"sub_q\">quarterly</label>\n"
"\t<input type=\"radio\" name=\"p3\" value=\"12\" id=\"sub_y\"/><label "
"for=\"sub_y\">yearly</label>\n"
=======
"\t<input type=\"radio\" name=\"p3\" value=\"1\" id=\"sub_m\" checked=\"checked\" /><label for=\"sub_m\">monthly</label>\n"
"\t<input type=\"radio\" name=\"p3\" value=\"3\" id=\"sub_q\"/><label for=\"sub_q\">quarterly</label>\n"
"\t<input type=\"radio\" name=\"p3\" value=\"12\" id=\"sub_y\"/><label for=\"sub_y\">yearly</label>\n"
>>>>>>> web/10400-farsi-only
"\t<br/>\n"
"\t<input type=\"submit\" value=\"Subscribe\" class=\"button\" />\n"
"</form>\n"
......@@ -307,38 +229,18 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
<<<<<<< HEAD
"<form action='https://www.paypal.com/cgi-bin/webscr' id='paypalForm' "
"method='post' target='_blank' class='donation'>\n"
=======
"<form action='https://www.paypal.com/cgi-bin/webscr' id='paypalForm' method='post' target='_blank' class='donation'>\n"
>>>>>>> web/10400-farsi-only
"\t<input name='cmd' type='hidden' value='_donations' />\n"
"\t<input name='business' type='hidden' value='donate@torservers.net' />\n"
"\t<input name='item_name' type='hidden' value='Tails one-time donation' />\n"
"\t<input type=\"hidden\" name=\"no_shipping\" value=\"1\"/>\n"
"\t<input name=\"lc\" type=\"hidden\" value=\"US\" />\n"
<<<<<<< HEAD
"\t<input type=\"radio\" name=\"amount\" value=\"5\" id=\"pp_5\" /><label "
"for=\"pp_5\">5</label>\n"
"\t<input type=\"radio\" name=\"amount\" value=\"10\" id=\"pp_10\"/><label "
"for=\"pp_10\">10</label>\n"
"\t<input type=\"radio\" name=\"amount\" value=\"20\" id=\"pp_20\"/><label "
"for=\"pp_20\">20</label>\n"
"\t<input type=\"radio\" name=\"amount\" value=\"50\" id=\"pp_50\"/><label "
"for=\"pp_50\">50</label>\n"
"\t<input type=\"radio\" name=\"amount\" value=\"100\" id=\"pp_100\"/><label "
"for=\"pp_100\">100</label>\n"
"\t<input type=\"radio\" name=\"amount\" value=\"\" id=\"pp_cust\" "
"checked=\"checked\"/><label for=\"pp_cust\">custom amount</label>\n"
=======
"\t<input type=\"radio\" name=\"amount\" value=\"5\" id=\"pp_5\" /><label for=\"pp_5\">5</label>\n"
"\t<input type=\"radio\" name=\"amount\" value=\"10\" id=\"pp_10\"/><label for=\"pp_10\">10</label>\n"
"\t<input type=\"radio\" name=\"amount\" value=\"20\" id=\"pp_20\"/><label for=\"pp_20\">20</label>\n"
"\t<input type=\"radio\" name=\"amount\" value=\"50\" id=\"pp_50\"/><label for=\"pp_50\">50</label>\n"
"\t<input type=\"radio\" name=\"amount\" value=\"100\" id=\"pp_100\"/><label for=\"pp_100\">100</label>\n"
"\t<input type=\"radio\" name=\"amount\" value=\"\" id=\"pp_cust\" checked=\"checked\"/><label for=\"pp_cust\">custom amount</label>\n"
>>>>>>> web/10400-farsi-only
"\t<select name=\"currency_code\">\n"
"\t\t<option value='EUR'>EUR</option>\n"
"\t\t<option value='USD'>USD</option>\n"
......@@ -376,10 +278,5 @@ msgstr ""
#. type: Plain text
msgid ""
<<<<<<< HEAD
"Our [[financial documents|doc/about/finances]] are available for your "
"review."
=======
"Our [[financial documents|doc/about/finances]] are available for your review."
>>>>>>> web/10400-farsi-only
msgstr ""
wiki/src/doc.fa.po
View file @ c27c192b
......@@ -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,33 +18,20 @@ 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=\"Documentation\"]]\n"
<<<<<<< HEAD
msgstr ""
#. type: Plain text
msgid "This documentation is a work in progress and a collective task."
msgstr ""
=======
msgstr "[[!meta title=\"مستندات\"]]\n"
#. type: Plain text
msgid "This documentation is a work in progress and a collective task."
msgstr "این مستندات در حال گسترش و کاری جمعی است."
>>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "<div class=\"tip\">\n"
<<<<<<< HEAD
msgstr ""
=======
msgstr "<div class=\"tip\">\n"
>>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
......@@ -66,162 +39,92 @@ msgid ""
"<p>If this section doesn't answer your questions, you can also look at our\n"
"[[FAQ|support/faq]].</p>\n"
msgstr ""
<<<<<<< HEAD
=======
"<p>اگر پاسخ سوالتان را در این بخش نگرفتید، می‌توانید به بخش [[سوال‌های "
"متداول ما|support/faq]] رجوع کنید.</p>\n"
>>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "</div>\n"
<<<<<<< HEAD
msgstr ""
=======
msgstr "</div>\n"
>>>>>>> web/10400-farsi-only
#. type: Plain text
msgid ""
"Read about how you can help [[improving Tails "
"documentation|/contribute/how/documentation]]."
msgstr ""
<<<<<<< HEAD
#. type: Plain text
msgid "- [[Introduction to this documentation|introduction]]"
msgstr ""
=======
"این‌جا بخوانید که چگونه می‌توانید به [[پیشرفت مستندات "
"تیلز|/contribute/how/documentation]] کمک کنید."
#. type: Plain text
msgid "- [[Introduction to this documentation|introduction]]"
msgstr "- [[مقدمه‌ای بر این سند|introduction]]"
>>>>>>> web/10400-farsi-only
#. type: Title #
#, no-wrap
msgid "General information"
<<<<<<< HEAD
msgstr ""
=======
msgstr "اطلاعات کلی"
>>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/about.index\" raw=\"yes\"]]\n"
<<<<<<< HEAD
msgstr ""
=======
msgstr "[[!inline pages=\"doc/about.index.fa\" raw=\"yes\"]]\n"
>>>>>>> web/10400-farsi-only
#. type: Title #
#, no-wrap
msgid "Download and verify"
<<<<<<< HEAD
msgstr ""
=======
msgstr "دانلود کردن و تأیید"
>>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/get.index\" raw=\"yes\"]]\n"
<<<<<<< HEAD
msgstr ""
=======
msgstr "[[!inline pages=\"doc/get.index.fa\" raw=\"yes\"]]\n"
>>>>>>> web/10400-farsi-only
#. type: Title #
#, no-wrap
msgid "First steps with Tails"
<<<<<<< HEAD
msgstr ""
=======
msgstr "اولین گام‌های کار با تیلز"
>>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/first_steps.index\" raw=\"yes\"]]\n"
<<<<<<< HEAD
msgstr ""
=======
msgstr "[[!inline pages=\"doc/first_steps.index.fa\" raw=\"yes\"]]\n"
>>>>>>> web/10400-farsi-only
#. type: Title #
#, no-wrap
msgid "Connect to the Internet anonymously"
<<<<<<< HEAD
msgstr ""
=======
msgstr "به صورت به ناشناس به اینترنت وصل شوید"
>>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/anonymous_internet.index\" raw=\"yes\"]]\n"
<<<<<<< HEAD
msgstr ""
=======
msgstr "[[!inline pages=\"doc/anonymous_internet.index.fa\" raw=\"yes\"]]\n"
>>>>>>> web/10400-farsi-only
#. type: Title #
#, no-wrap
msgid "Encryption and privacy"
<<<<<<< HEAD
msgstr ""
=======
msgstr "رمز‌گذاری و حریم خصوصی"
>>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/encryption_and_privacy.index\" raw=\"yes\"]]\n"
<<<<<<< HEAD
msgstr ""
=======
msgstr "[[!inline pages=\"doc/encryption_and_privacy.index.fa\" raw=\"yes\"]]\n"
>>>>>>> web/10400-farsi-only
#. type: Title #
#, no-wrap
msgid "Work on sensitive documents"
<<<<<<< HEAD
msgstr ""
=======
msgstr "کار روی مستندات مهم"
>>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/sensitive_documents.index\" raw=\"yes\"]]\n"
<<<<<<< HEAD
msgstr ""
=======
msgstr "[[!inline pages=\"doc/sensitive_documents.index.fa\" raw=\"yes\"]]\n"
>>>>>>> web/10400-farsi-only
#. type: Title #
#, no-wrap
msgid "Advanced topics"
<<<<<<< HEAD
msgstr ""
=======
msgstr "موضوع‌های پیشرفته"
>>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"doc/advanced_topics.index\" raw=\"yes\"]]\n"
<<<<<<< HEAD
msgstr ""
=======
msgstr "[[!inline pages=\"doc/advanced_topics.index.fa\" raw=\"yes\"]]\n"
>>>>>>> web/10400-farsi-only
wiki/src/doc/about.fa.po
View file @ c27c192b
......@@ -7,11 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
<<<<<<< HEAD
"POT-Creation-Date: 2015-12-23 15:02+0100\n"
=======