summaryrefslogtreecommitdiffstats
path: root/wiki/src/press.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/press.fa.po
parent4c95bb2434c3d85a9a8c8ae14104a66afb4cd264 (diff)
Fix badly resolved conflicts
Diffstat (limited to 'wiki/src/press.fa.po')
-rw-r--r--wiki/src/press.fa.po320
1 files changed, 0 insertions, 320 deletions
diff --git a/wiki/src/press.fa.po b/wiki/src/press.fa.po
index da5e209..0727826 100644
--- a/wiki/src/press.fa.po
+++ b/wiki/src/press.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: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,34 +18,21 @@ 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=\"Press and media information\"]]\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "[[!meta title=\"اطلاعات خبری و رسانه‌ای\"]]\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "[[!toc levels=1]]\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "[[!toc levels=1]]\n"
->>>>>>> web/10400-farsi-only
#. type: Title =
#, no-wrap
msgid "Announcements and press releases\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "اعلان‌ها و اطلاعیه‌های خبری\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
msgid ""
@@ -67,11 +40,8 @@ msgid ""
"email or by RSS feed on [[Tails News|news]]. They are mainly meant for "
"Tails users."
msgstr ""
-<<<<<<< HEAD
-=======
"اعلان‌های معمولی که منتشر می‌کنیم از طریق رایانه یا خوراک آراس‌اس در [[اخبار "
"تیلز|news]] در دسترس هستند. آن‌ها عموماً برای کاربران تیلز هستند."
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
@@ -80,14 +50,6 @@ msgid ""
"the website. Write us an email at <tails-press@boum.org> if you want \n"
"to receive future press releases, or if you have a press inquiry.\n"
msgstr ""
-<<<<<<< HEAD
-
-#. type: Plain text
-msgid ""
-"You can also send press articles about Tails to this address, so we can add "
-"them to this page."
-msgstr ""
-=======
"گاهی اطلاعیه‌های خبری منتشر می‌کنیم اما آن‌ها را روی تارنما آرشیو نمی‌کنیم.\n"
" اگر می‌خواهید اطلاعیه‌های خبری آتی را دریافت کنید یا سوالی در این زمینه "
"دارید\n"
@@ -100,16 +62,11 @@ msgid ""
msgstr ""
"همچنین می‌توانید مقاله‌های خود در مورد تیلز را به این نشانی بفرستید و ما آن‌"
"ها را به این صفحه اضافه می‌کنیم :)"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "<div class=\"note\">\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "<div class=\"note\">\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
@@ -119,37 +76,19 @@ msgid ""
"public key|doc/about/openpgp_keys#press]].\n"
"</p>\n"
msgstr ""
-<<<<<<< HEAD
-=======
"<p>\n"
"از شما دعوت می‌کنیم سوالات خبری خود را با [[کلید عمومی\n"
"پی‌جی‌پی ما|doc/about/openpgp_keys#press]] رمزگذاری کنید.\n"
"</p>\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "</div>\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "</div>\n"
->>>>>>> web/10400-farsi-only
#. type: Title =
#, no-wrap
msgid "Quick links to better understand Tails\n"
-<<<<<<< HEAD
-msgstr ""
-
-#. type: Bullet: '* '
-msgid "[[About Tails|about]] for a quick overview"
-msgstr ""
-
-#. type: Bullet: '* '
-msgid "[Tor overview](https://www.torproject.org/about/overview.html.en)"
-msgstr ""
-=======
msgstr "پیوندهای سریع برای فهم بهتر تیلز\n"
#. type: Bullet: '* '
@@ -159,44 +98,29 @@ msgstr "[[دربارهٔ تیلز|about]] برای نگاهی سریع"
#. type: Bullet: '* '
msgid "[Tor overview](https://www.torproject.org/about/overview.html.en)"
msgstr "[مرور تور](https://www.torproject.org/about/overview.html.en)"
->>>>>>> web/10400-farsi-only
#. type: Bullet: '* '
msgid ""
"More details about the [[features and software|doc/about/features]] included "
"in Tails"
msgstr ""
-<<<<<<< HEAD
-=======
"جزییات بیشتر در مورد [[ویژگی‌ها و نرم‌افزارهای|doc/about/features]] تیلز"
->>>>>>> web/10400-farsi-only
#. type: Bullet: '* '
msgid ""
"Our [[design document|contribute/design]] about Tails specification, threat "
"model and implementation"
msgstr ""
-<<<<<<< HEAD
-
-#. type: Bullet: '* '
-msgid "Our [[documentation|doc]] explaining in details how to use Tails"
-msgstr ""
-=======
"[[سند طراحی|contribute/design]] ما در مورد خصوصیات تیلز، مدل تهدید و اجرای آن"
#. type: Bullet: '* '
msgid "Our [[documentation|doc]] explaining in details how to use Tails"
msgstr "[[مستندهای|doc]] ما که جزییات چگونگی استفاده از تیلز را توضیح می‌دهند"
->>>>>>> web/10400-farsi-only
#. type: Title =
#, no-wrap
msgid "Media appearances\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "حضورهای رسانه‌ای\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
msgid ""
@@ -204,29 +128,18 @@ msgid ""
"is not comprehensive, but illustrates some of the significant articles that "
"have been published about Tails."
msgstr ""
-<<<<<<< HEAD
-=======
"نام تیلز مرتب در مقاله‌های خبری و پژوهشی می‌آید. این فهرست کامل نیست، اما "
"برخی مقاله‌های مهم که در مورد تیلز منتشر شده را نشان می‌دهد."
->>>>>>> web/10400-farsi-only
#. type: Title -
#, no-wrap
msgid "2015\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "۲۰۱۵\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"press/media_appearances_2015\" raw=\"yes\"]]\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "[[!inline pages=\"press/media_appearances_2015\" raw=\"yes\"]]\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
@@ -234,24 +147,6 @@ msgid ""
"Older media appearances\n"
"----------------------\n"
msgstr ""
-<<<<<<< HEAD
-
-#. type: Bullet: '* '
-msgid "[[!toggle id=\"media_appearances_2014\" text=\"2014\"]]"
-msgstr ""
-
-#. type: Bullet: '* '
-msgid "[[!toggle id=\"media_appearances_2013\" text=\"2013\"]]"
-msgstr ""
-
-#. type: Bullet: '* '
-msgid "[[!toggle id=\"media_appearances_2012\" text=\"2012\"]]"
-msgstr ""
-
-#. type: Bullet: '* '
-msgid "[[!toggle id=\"media_appearances_2011\" text=\"2011\"]]"
-msgstr ""
-=======
"حضورهای رسانه‌ای قدیمی‌تر\n"
"----------------------\n"
@@ -270,21 +165,10 @@ msgstr "[[!toggle id=\"media_appearances_2012\" text=\"۲۰۱۲\"]]"
#. type: Bullet: '* '
msgid "[[!toggle id=\"media_appearances_2011\" text=\"2011\"]]"
msgstr "[[!toggle id=\"media_appearances_2011\" text=\"۲۰۱۱\"]]"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "[[!toggleable id=\"media_appearances_2014\" text=\"\"\"\n"
-<<<<<<< HEAD
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<span class=\"hide\">[[!toggle id=\"media_appearances_2014\" "
-"text=\"\"]]</span>\n"
-msgstr ""
-=======
msgstr "[[!toggleable id=\"media_appearances_2014\" text=\"\"\"\n"
#. type: Plain text
@@ -293,39 +177,20 @@ msgid "<span class=\"hide\">[[!toggle id=\"media_appearances_2014\" text=\"\"]]<
msgstr ""
"<span class=\"hide\">[[!toggle id=\"media_appearances_2014\" text=\"\""
"]]</span>\n"
->>>>>>> web/10400-farsi-only
#. type: Title -
#, no-wrap
msgid "2014\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "۲۰۱۴\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"press/media_appearances_2014\" raw=\"yes\"]]\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "[[!inline pages=\"press/media_appearances_2014\" raw=\"yes\"]]\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "[[!toggleable id=\"media_appearances_2013\" text=\"\"\"\n"
-<<<<<<< HEAD
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<span class=\"hide\">[[!toggle id=\"media_appearances_2013\" "
-"text=\"\"]]</span>\n"
-msgstr ""
-=======
msgstr "[[!toggleable id=\"media_appearances_2013\" text=\"\"\"\n"
#. type: Plain text
@@ -334,39 +199,20 @@ msgid "<span class=\"hide\">[[!toggle id=\"media_appearances_2013\" text=\"\"]]<
msgstr ""
"<span class=\"hide\">[[!toggle id=\"media_appearances_2013\" text=\"\""
"]]</span>\n"
->>>>>>> web/10400-farsi-only
#. type: Title -
#, no-wrap
msgid "2013\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "۲۰۱۳\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"press/media_appearances_2013\" raw=\"yes\"]]\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "[[!inline pages=\"press/media_appearances_2013\" raw=\"yes\"]]\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "[[!toggleable id=\"media_appearances_2012\" text=\"\"\"\n"
-<<<<<<< HEAD
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<span class=\"hide\">[[!toggle id=\"media_appearances_2012\" "
-"text=\"\"]]</span>\n"
-msgstr ""
-=======
msgstr "[[!toggleable id=\"media_appearances_2012\" text=\"\"\"\n"
#. type: Plain text
@@ -375,39 +221,20 @@ msgid "<span class=\"hide\">[[!toggle id=\"media_appearances_2012\" text=\"\"]]<
msgstr ""
"<span class=\"hide\">[[!toggle id=\"media_appearances_2012\" text=\"\""
"]]</span>\n"
->>>>>>> web/10400-farsi-only
#. type: Title -
#, no-wrap
msgid "2012\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "۲۰۱۲\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"press/media_appearances_2012\" raw=\"yes\"]]\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "[[!inline pages=\"press/media_appearances_2012\" raw=\"yes\"]]\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "[[!toggleable id=\"media_appearances_2011\" text=\"\"\"\n"
-<<<<<<< HEAD
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"<span class=\"hide\">[[!toggle id=\"media_appearances_2011\" "
-"text=\"\"]]</span>\n"
-msgstr ""
-=======
msgstr "[[!toggleable id=\"media_appearances_2011\" text=\"\"\"\n"
#. type: Plain text
@@ -416,56 +243,20 @@ msgid "<span class=\"hide\">[[!toggle id=\"media_appearances_2011\" text=\"\"]]<
msgstr ""
"<span class=\"hide\">[[!toggle id=\"media_appearances_2011\" text=\"\""
"]]</span>\n"
->>>>>>> web/10400-farsi-only
#. type: Title -
#, no-wrap
msgid "2011\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "۲۰۱۱\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"press/media_appearances_2011\" raw=\"yes\"]]\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "[[!inline pages=\"press/media_appearances_2011\" raw=\"yes\"]]\n"
->>>>>>> web/10400-farsi-only
#. type: Title =
#, no-wrap
msgid "Awards\n"
-<<<<<<< HEAD
-msgstr ""
-
-#. type: Bullet: '* '
-msgid ""
-"2014-12-01: Tails was awarded the [November 2014 DistroWatch.com "
-"donation](http://distrowatch.com/weekly.php?issue=20141201#donation)"
-msgstr ""
-
-#. type: Bullet: '* '
-msgid ""
-"2014-06-06: Tails received an honorable mention at [APC FLOSS "
-"Prize](https://www.apc.org/es/node/19368): \"In particular, the jury wishes "
-"to highlight the Tails project, for breaking ground in the area of user "
-"privacy protection.\""
-msgstr ""
-
-#. type: Bullet: '* '
-msgid ""
-"2014-03-11: Tails won the [2014 Access Innovation "
-"Prize](https://www.accessnow.org/blog/2014/03/11/2014-access-innovation-prize-winners-announced-at-rightscon), "
-"for Endpoint Security. Access reports that \"Tails embodies the successful "
-"collaboration of developers, trainers, security professionals towards "
-"tackling the spectrum of user needs -- from usability to security -- in "
-"high-risk environments\"."
-msgstr ""
-=======
msgstr "جایزه‌ها\n"
#. type: Bullet: '* '
@@ -503,54 +294,10 @@ msgstr ""
"مربوطه آمده که «تیلز تجسم همکاری موفقیت‌آمیز توسعه‌دهندگان، آموزش‌دهندگان و "
"حرفه‌ای‌های بخش امنیت برای پاسخ دادن به نیازهای کاربران در محیط‌های پرخطر "
"است؛ از کاربردپذیری گرفته تا امنیت»."
->>>>>>> web/10400-farsi-only
#. type: Title =
#, no-wrap
msgid "Conferences\n"
-<<<<<<< HEAD
-msgstr ""
-
-#. type: Bullet: '* '
-msgid ""
-"2014-12-29: In [Reconstructive "
-"narratives](http://media.ccc.de/browse/congress/2014/31c3_-_6258_-_en_-_saal_1_-_201412282030_-_reconstructing_narratives_-_jacob_-_laura_poitras.html#video) "
-"at the 31th Chaos Communication Congress, Jacob Appelbaum and Laura Poitras "
-"explained that properly implemented encryption technologies such as Tor, "
-"Tails, GnuPG, OTR, and RedPhone are some of the only ones that can blind the "
-"pervasive surveillance of the NSA. They are rated as \"catastrophic\" by "
-"the NSA itself."
-msgstr ""
-
-#. type: Bullet: '* '
-msgid ""
-"2014-07-16: [The Amnesic Incognito Live "
-"System](http://interference.io/amnesic-incognito-live-system) at "
-"Interference"
-msgstr ""
-
-#. type: Bullet: '* '
-msgid ""
-"2014-03-16: [Lightning talk about "
-"Tails](http://meetings-archive.debian.net/pub/debian-meetings/2014/mini-debconf-barcelona/Lightning_Talks.webm) "
-"at 2014 Mini-Debconf in Barcelona. The talk begins at 24:15 of the video."
-msgstr ""
-
-#. type: Bullet: '* '
-msgid ""
-"2013-12-30: Jacob Appelbaum stated at the [30th Chaos Communication "
-"Congress](https://events.ccc.de/congress/2013/Fahrplan/events/5713.html): "
-"\"if you are a journalist and you are not using Tails, you should probably "
-"be using Tails, unless you *really* know what you're doing\"."
-msgstr ""
-
-#. type: Bullet: '* '
-msgid ""
-"2013-12-29: [Tails needs your "
-"help!](https://events.ccc.de/congress/2013/wiki/Session:Tails_needs_your_help!) "
-"at 30C3"
-msgstr ""
-=======
msgstr "کنفرانس‌ها\n"
#. type: Bullet: '* '
@@ -610,35 +357,21 @@ msgid ""
msgstr ""
"۲۰۱۳/۱۲/۲۹: [تیلز به کمک شما نیاز دارد!](https://events.ccc.de/congress/2013/"
"wiki/Session:Tails_needs_your_help!) در 30C3"
->>>>>>> web/10400-farsi-only
#. type: Bullet: '* '
msgid ""
"2013-11-28: [Helping Human Rights Defenders to Communicate Securely: TAILS, "
-<<<<<<< HEAD
-"National Democratic Institute, "
-"USA](http://www.coe.int/en/web/world-forum-democracy/lab4_) at the World "
-"Forum for Democracy"
-msgstr ""
-=======
"National Democratic Institute, USA](http://www.coe.int/en/web/world-forum-"
"democracy/lab4_) at the World Forum for Democracy"
msgstr ""
"۲۰۱۳/۱۱/۲۸: [کمک به مدافعان حقوق بشر برای برقراری ارتباط امن: تیلز، موسسه "
"دموکراتیک ملی، آمریکا](http://www.coe.int/en/web/world-forum-democracy/lab4_)"
" در World Forum for Democracy"
->>>>>>> web/10400-farsi-only
#. type: Bullet: '* '
msgid ""
"2013-10-30: [Tails : confidentialité et anonymat, pour tous et "
"partout — L'utilisabilité et de la maintenabilité, fonctionnalités critiques "
-<<<<<<< HEAD
-"pour la "
-"sécurité](https://www.irill.org/events/tails-confidentialite-et-anonymat-pour-tous-et-partout) "
-"at [IRILL](https://www.irill.org/)"
-msgstr ""
-=======
"pour la sécurité](https://www.irill.org/events/tails-confidentialite-et-"
"anonymat-pour-tous-et-partout) at [IRILL](https://www.irill.org/)"
msgstr ""
@@ -646,21 +379,10 @@ msgstr ""
"L'utilisabilité et de la maintenabilité, fonctionnalités critiques pour la "
"sécurité](https://www.irill.org/events/tails-confidentialite-et-anonymat-"
"pour-tous-et-partout) در [IRILL](https://www.irill.org/)"
->>>>>>> web/10400-farsi-only
#. type: Title =
#, no-wrap
msgid "Films and videos\n"
-<<<<<<< HEAD
-msgstr ""
-
-#. type: Bullet: '* '
-msgid ""
-"[Tails 1.3 : The Amnesic Incognito Live "
-"System](https://www.youtube.com/watch?v=_xna6wnn-Uw&feature=youtu.be), by "
-"Linux Scoop, an introductory video to Tails 1.3."
-msgstr ""
-=======
msgstr "فیلم‌ها و ویدیوها\n"
#. type: Bullet: '* '
@@ -672,22 +394,12 @@ msgstr ""
"[Tails 1.3 : The Amnesic Incognito Live "
"System](https://www.youtube.com/watch?v=_xna6wnn-Uw&feature=youtu.be)، از "
"Linux Scoop، یک ویدیو برای آشنایی با تیلز ۱٫۳."
->>>>>>> web/10400-farsi-only
#. type: Bullet: '* '
msgid ""
"Tails is being used in [Citizenfour](https://citizenfourfilm.com/) by Laura "
"Poitras and appears in the credits."
msgstr ""
-<<<<<<< HEAD
-
-#. type: Bullet: '* '
-msgid ""
-"[Probando TAILS 0.16 Privacidad y "
-"Anonimato](https://www.youtube.com/watch?v=bBdGbK54WPE), an introductory "
-"video to Tails, in Spanish."
-msgstr ""
-=======
"تیلز توسط لورا پویتراس در [Citizenfour](https://citizenfourfilm.com/) "
"استفاده شده و در عنوان‌بندی به آن اشاره می‌شود."
@@ -699,26 +411,16 @@ msgstr ""
"[Probando TAILS 0.16 Privacidad y "
"Anonimato](https://www.youtube.com/watch?v=bBdGbK54WPE) یک ویدیو برای آشنایی "
"با تیلز، به اسپانیایی."
->>>>>>> web/10400-farsi-only
#. type: Title =
#, no-wrap
msgid "Books, booklets, and guide\n"
-<<<<<<< HEAD
-msgstr ""
-
-#. type: Bullet: '* '
-msgid ""
-"2015-06: [L’informatique : se défendre et "
-"attaquer](https://infokiosques.net/spip.php?article1045) (in French)."
-=======
msgstr "کتاب‌ها، کتابچه‌ها و راهنماها\n"
#. type: Bullet: '* '
msgid ""
"2015-06: [L’informatique : se défendre et attaquer](https://infokiosques.net/"
"spip.php?article1045) (in French)."
->>>>>>> web/10400-farsi-only
msgstr ""
#. type: Plain text
@@ -729,24 +431,18 @@ msgid ""
"safehubcollective.org qualifies Tails as \"ultimate anonymity and\n"
"amnesia\".\n"
msgstr ""
-<<<<<<< HEAD
-=======
"*۲۰۱۵/۰۳: [یک خودآموز امنیت آنلاین "
"فمینیستی](https://tech.safehubcollective.org/cybersecurity/)\n"
" از safehubcollective.org تیلز را \n"
"«ناشناسی و فراموشی مطلق» می‌داند.\n"
->>>>>>> web/10400-farsi-only
#. type: Bullet: '* '
msgid ""
"2014-12: [Guide d'autodéfense numérique](https://guide.boum.org/) has "
"several sections based on Tails (in French)."
msgstr ""
-<<<<<<< HEAD
-=======
"۲۰۱۴/۱۲: [Guide d'autodéfense numérique](https://guide.boum.org/) چندین بخش "
"در مورد تیلز دارد (به فرانسوی)."
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
@@ -755,28 +451,13 @@ msgid ""
"system](https://capulcu.nadir.org/) by capulcu is a booklet explaining\n"
"Tails for activists (in German).\n"
msgstr ""
-<<<<<<< HEAD
-=======
"*۲۰۱۴/۱۲: [Band I: Tails - The amnesic incognito live\n"
"system](https://capulcu.nadir.org/) از capulcu کتابچه‌ای \n"
"است که تیلز را به فعالان توضیح می‌دهد (به آلمانی).\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid ""
-<<<<<<< HEAD
-"* 2013-08-26: [Practical anonymity](http://www.loshin.com/) by Peter Loshin "
-"has\n"
-"a dedicated chapter on Tails.\n"
-msgstr ""
-
-#. type: Bullet: '* '
-msgid ""
-"[We Fight "
-"Censorship](http://www.wefightcensorship.org/article/tails-amnesic-incognito-live-systemhtml.html) "
-"from Reporters Without Borders."
-=======
"* 2013-08-26: [Practical anonymity](http://www.loshin.com/) by Peter Loshin has\n"
"a dedicated chapter on Tails.\n"
msgstr ""
@@ -788,7 +469,6 @@ msgstr ""
msgid ""
"[We Fight Censorship](http://www.wefightcensorship.org/article/tails-amnesic-"
"incognito-live-systemhtml.html) from Reporters Without Borders."
->>>>>>> web/10400-farsi-only
msgstr ""
#. type: Bullet: '* '