summaryrefslogtreecommitdiffstats
path: root/wiki/src/contribute.fa.po
diff options
context:
space:
mode:
authorsajolida <sajolida@pimienta.org>2015-12-23 15:33:27 (GMT)
committersajolida <sajolida@pimienta.org>2015-12-23 15:33:27 (GMT)
commitc27c192b60870f7a584d492e143c3a9c79ff546f (patch)
treef2a4395e4cd5fc9f08e69033832bae5976e4165c /wiki/src/contribute.fa.po
parent4c95bb2434c3d85a9a8c8ae14104a66afb4cd264 (diff)
Fix badly resolved conflicts
Diffstat (limited to 'wiki/src/contribute.fa.po')
-rw-r--r--wiki/src/contribute.fa.po289
1 files changed, 0 insertions, 289 deletions
diff --git a/wiki/src/contribute.fa.po b/wiki/src/contribute.fa.po
index 460b0ec..aa0b281 100644
--- a/wiki/src/contribute.fa.po
+++ b/wiki/src/contribute.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,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=\"Contributing to Tails\"]]\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "[[!meta title=\"کمک به تیلز\"]]\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
msgid ""
@@ -49,12 +30,9 @@ msgid ""
"whatever you bring to this community will be appreciated. So read on to "
"find out how you can make a difference in Tails."
msgstr ""
-<<<<<<< HEAD
-=======
"راه‌های بسیاری برای کمک شما به تیلز وجود دارند. هیچ تلاشی ناچیز نیست و هر "
"چیزی که به این مجموعه اضافه کنید جای قدردانی دارد. بنابراین به خواندن ادامه "
"دهید تا دریابید چطور می‌توانید به تغییر تیلز کمک کنید."
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
@@ -63,31 +41,19 @@ msgid ""
"<h2>Share your experience</h2>\n"
"<div class=\"contribute-role\" id=\"user\">\n"
msgstr ""
-<<<<<<< HEAD
-=======
"<div class=\"contribute-roles-1\">\n"
"<h2>Share your experience</h2>\n"
"<div class=\"contribute-role\" id=\"user\">\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid " [[!img user.png link=no]]\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr " [[!img user.png link=no]]\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid ""
-<<<<<<< HEAD
-" <p>Every user can help others or provide developers with useful "
-"information.</p>\n"
-=======
" <p>Every user can help others or provide developers with useful information.</p>\n"
->>>>>>> web/10400-farsi-only
" <ul>\n"
" <li>[[Report bugs|doc/first_steps/bug_reporting]]</li>\n"
" <li>[[Test experimental ISO images|contribute/how/testing]]</li>\n"
@@ -97,8 +63,6 @@ msgid ""
"</div>\n"
"</div>\n"
msgstr ""
-<<<<<<< HEAD
-=======
" <p>هر کاربری می‌تواند به دیگران کمک کند یا اطلاعاتی مفید در اختیار برنامه‌"
"نویسان قرار دهد.</p>\n"
" <ul>\n"
@@ -109,7 +73,6 @@ msgstr ""
" </ul>\n"
"</div>\n"
"</div>\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
@@ -118,21 +81,14 @@ msgid ""
"<h2>Donate</h2>\n"
"<div class=\"contribute-role\" id=\"donate\">\n"
msgstr ""
-<<<<<<< HEAD
-=======
"<div class=\"contribute-roles-1\">\n"
"<h2>کمک مالی</h2>\n"
"<div class=\"contribute-role\" id=\"donate\">\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid " [[!img donate.png link=no]]\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr " [[!img donate.png link=no]]\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
@@ -144,15 +100,12 @@ msgid ""
"</div>\n"
"</div>\n"
msgstr ""
-<<<<<<< HEAD
-=======
" <p>کمک‌های مالی پیشرفت تیلز را سریع‌تر می‌کنند.</p>\n"
" <ul>\n"
" <li>[[انجام کمک مالی|contribute/how/donate]]</li>\n"
" </ul>\n"
"</div>\n"
"</div>\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
@@ -162,22 +115,15 @@ msgid ""
"<div class=\"contribute-role\" id=\"content-writer\">\n"
" <h3>Writer</h3>\n"
msgstr ""
-<<<<<<< HEAD
-=======
"<div class=\"contribute-roles-3\">\n"
"<h2>با مهارت‌های زبانی خود کمک کنید</h2>\n"
"<div class=\"contribute-role\" id=\"content-writer\">\n"
" <h3>نویسنده</h3>\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid " [[!img writer.png link=no]]\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr " [[!img writer.png link=no]]\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
@@ -191,8 +137,6 @@ msgid ""
"<div class=\"contribute-role\" id=\"translator\">\n"
" <h3>Translator</h3>\n"
msgstr ""
-<<<<<<< HEAD
-=======
" <p>نویسندگان خوب می‌توانند باعث شوند تیلز در دسترس افراد بیشتری قرار "
"بگیرد.</p>\n"
" <ul>\n"
@@ -202,35 +146,23 @@ msgstr ""
"</div>\n"
"<div class=\"contribute-role\" id=\"translator\">\n"
" <h3>مترجم</h3>\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid " [[!img translator.png link=no]]\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr " [[!img translator.png link=no]]\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid ""
" <p>Translators can allow more people around the world to use Tails.</p>\n"
" <ul>\n"
-<<<<<<< HEAD
-" <li>[[Improve Tails in your own "
-"language|contribute/how/translate]]</li>\n"
-=======
" <li>[[Improve Tails in your own language|contribute/how/translate]]</li>\n"
->>>>>>> web/10400-farsi-only
" </ul>\n"
"</div>\n"
"<div class=\"contribute-role\" id=\"speaker\">\n"
" <h3>Speaker</h3>\n"
msgstr ""
-<<<<<<< HEAD
-=======
" <p>مترجمان نیز می‌توانند باعث شوند افراد بیشتری در سرتاسر دنیا از تیلز "
"استفاده کنند.</p>\n"
" <ul>\n"
@@ -239,16 +171,11 @@ msgstr ""
"</div>\n"
"<div class=\"contribute-role\" id=\"speaker\">\n"
" <h3>گوینده</h3>\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid " [[!img speaker.png link=no]]\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr " [[!img speaker.png link=no]]\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
@@ -261,8 +188,6 @@ msgid ""
"</div>\n"
"</div>\n"
msgstr ""
-<<<<<<< HEAD
-=======
" <p>گوینده‌ها می‌توانند تیلز را به افراد مختلف معرفی کنند.</p>\n"
" <ul>\n"
" <li>[[صحبت کردن در رخدادها|contribute/how/promote]]</li>\n"
@@ -270,7 +195,6 @@ msgstr ""
" </ul>\n"
"</div>\n"
"</div>\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
@@ -280,22 +204,15 @@ msgid ""
"<div class=\"contribute-role\" id=\"developer\">\n"
" <h3>Developer or maintainer</h3>\n"
msgstr ""
-<<<<<<< HEAD
-=======
"<div class=\"contribute-roles-3\">\n"
"<h2>با مهارت‌های رایانه‌ای خود کمک کنید</h2>\n"
"<div class=\"contribute-role\" id=\"developer\">\n"
" <h3>برنامه‌نویس یا مسئول نگهداری نرم‌افزار</h3>\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid " [[!img software_developer.png link=no]]\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr " [[!img software_developer.png link=no]]\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
@@ -309,8 +226,6 @@ msgid ""
"<div class=\"contribute-role\" id=\"sysadmin\">\n"
" <h3>System administrator</h3>\n"
msgstr ""
-<<<<<<< HEAD
-=======
" <p>افراد نرم‌افزاری با مهارت‌های بسیار متنوع می‌توانند به بهبود تیلز کمک "
"کنند.</p>\n"
" <ul>\n"
@@ -320,26 +235,16 @@ msgstr ""
"</div>\n"
"<div class=\"contribute-role\" id=\"sysadmin\">\n"
" <h3>مدیر سیستم</h3>\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid " [[!img system_administrator.png link=no]]\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr " [[!img system_administrator.png link=no]]\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid ""
-<<<<<<< HEAD
-" <p>System administrators can contribute to the infrastructure behind "
-"Tails.</p>\n"
-=======
" <p>System administrators can contribute to the infrastructure behind Tails.</p>\n"
->>>>>>> web/10400-farsi-only
" <ul>\n"
" <li>[[Run a HTTP mirror|contribute/how/mirror]]</li>\n"
" <li>[[Improve Tails infrastructure|contribute/how/sysadmin]]</li>\n"
@@ -348,8 +253,6 @@ msgid ""
"<div class=\"contribute-role\" id=\"designer\">\n"
" <h3>Designer</h3>\n"
msgstr ""
-<<<<<<< HEAD
-=======
" <p>مدیران سیستم می‌توانند به زیرساخت پشت تیلز کمک کنند.</p>\n"
" <ul>\n"
" <li>[[اجرای یک آیینهٔ اچ‌تی‌تی‌پی|contribute/how/mirror]]</li>\n"
@@ -358,16 +261,11 @@ msgstr ""
"</div>\n"
"<div class=\"contribute-role\" id=\"designer\">\n"
" <h3>طراح</h3>\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid " [[!img designer.png link=no]]\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr " [[!img designer.png link=no]]\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
@@ -376,18 +274,11 @@ msgid ""
" <ul>\n"
" <li>[[Improve the website|contribute/how/website]]</li>\n"
" <li>[[Design graphics|contribute/how/graphics]]</li>\n"
-<<<<<<< HEAD
-" <li>[[Improve the Tails user "
-"interface|contribute/how/user_interface]]</li>\n"
-=======
" <li>[[Improve the Tails user interface|contribute/how/user_interface]]</li>\n"
->>>>>>> web/10400-farsi-only
" </ul>\n"
"</div>\n"
"</div>\n"
msgstr ""
-<<<<<<< HEAD
-=======
" <p>طراحان می‌توانند استفاده از تیلز را ساده‌تر و دلپذیرتر کنند.</p>\n"
" <ul>\n"
" <li>[[بهبود تارنما|contribute/how/website]]</li>\n"
@@ -396,43 +287,21 @@ msgstr ""
" </ul>\n"
"</div>\n"
"</div>\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "<div class=\"toc\">\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "<div class=\"toc\">\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "\t<h1>Table of contents</h1>\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "\t<h1>فهرست مطالب</h1>\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid ""
"\t<ol>\n"
-<<<<<<< HEAD
-"\t\t<li class=\"L2\"><a href=\"#reference-documents\">Reference "
-"documents</a></li>\n"
-"\t\t<li class=\"L2\"><a href=\"#tools\">Tools for contributors</a></li>\n"
-"\t\t<li class=\"L2\"><a href=\"#release-cycle\">Release cycle</a></li>\n"
-"\t\t<li class=\"L2\"><a href=\"#upstream\">Relationship with "
-"upstream</a></li>\n"
-"\t\t<li class=\"L2\"><a href=\"#collective-process\">Collective "
-"process</a></li>\n"
-"\t\t<li class=\"L2\"><a href=\"#talk\">Talk with us</a></li>\n"
-"\t</ol>\n"
-msgstr ""
-=======
"\t\t<li class=\"L2\"><a href=\"#reference-documents\">Reference documents</a></li>\n"
"\t\t<li class=\"L2\"><a href=\"#tools\">Tools for contributors</a></li>\n"
"\t\t<li class=\"L2\"><a href=\"#release-cycle\">Release cycle</a></li>\n"
@@ -449,77 +318,38 @@ msgstr ""
"\t\t<li class=\"L2\"><a href=\"#collective-process\">روند جمعی</a></li>\n"
"\t\t<li class=\"L2\"><a href=\"#talk\">با ما تماس بگیرید</a></li>\n"
"\t</ol>\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "</div> <!-- .toc -->\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "</div> <!-- .toc -->\n"
->>>>>>> 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
msgid ""
"This section is only in English, because there is currently no way to "
"contribute to Tails if you do not understand English."
msgstr ""
-<<<<<<< HEAD
-=======
"این بخش تنها به انگلیسی است، چون در حال حاضر اگر انگلیسی ندانید راهی برای "
"کمک کردن شما به تیلز وجود ندارد."
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "</div>\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "</div>\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "<a id=\"reference-documents\"></a>\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "<a id=\"reference-documents\"></a>\n"
->>>>>>> web/10400-farsi-only
#. type: Title =
#, no-wrap
msgid "Reference documents\n"
-<<<<<<< HEAD
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid "[[Design documents|contribute/design]]"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid "[[Blueprints|blueprint]]"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid "[[Merge policy|contribute/merge_policy]]"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid "[[!tails_website contribute/how/promote/material/logo desc=\"Logo\"]]"
-msgstr ""
-=======
msgstr "اسناد ارجاع\n"
#. type: Bullet: ' - '
@@ -537,33 +367,20 @@ msgstr "[[سیاست ادغام|contribute/merge_policy]]"
#. type: Bullet: ' - '
msgid "[[!tails_website contribute/how/promote/material/logo desc=\"Logo\"]]"
msgstr "[[!tails_website contribute/how/promote/material/logo desc=\"Logo\"]]"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "<a id=\"tools\"></a>\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "<a id=\"tools\"></a>\n"
->>>>>>> web/10400-farsi-only
#. type: Title =
#, no-wrap
msgid "Tools for contributors\n"
-<<<<<<< HEAD
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid "Source code: [[Git repositories|contribute/git]]"
-msgstr ""
-=======
msgstr "ابزارهایی برای کمک\n"
#. type: Bullet: ' - '
msgid "Source code: [[Git repositories|contribute/git]]"
msgstr "کد منبع: [[مخازن گیت|contribute/git]]"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
@@ -574,16 +391,6 @@ msgid ""
" - [Tasks](https://labs.riseup.net/code/projects/tails/issues)\n"
" can be filtered by type of work (see links in the sidebar)\n"
" - [[Building a Tails image|contribute/build]]\n"
-<<<<<<< HEAD
-" - [[Build a local copy of the website|contribute/build/website]]\n"
-" - [[Customize Tails|contribute/customize]]\n"
-" - [[Debian package builder|contribute/Debian_package_builder]], to "
-"automatically build our custom packages\n"
-" - [[APT repository|contribute/APT_repository]], to store our custom Debian "
-"packages\n"
-" - [[Glossary for contributors|contribute/glossary]]\n"
-msgstr ""
-=======
" - [[Build the website|contribute/build/website]]\n"
" - [[Customize Tails|contribute/customize]]\n"
" - [[Debian package builder|contribute/Debian_package_builder]], to automatically build our custom packages\n"
@@ -604,71 +411,36 @@ msgstr ""
" - [[مخازن APT|contribute/APT_repository]] برای ذخیره کردن بسته‌های اختصاصی "
"دبیان ما\n"
" - [[واژه‌نامه برای کمک‌کنندگان|contribute/glossary]]\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "<a id=\"release-cycle\"></a>\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "<a id=\"release-cycle\"></a>\n"
->>>>>>> web/10400-farsi-only
#. type: Title =
#, no-wrap
msgid "Release cycle\n"
-<<<<<<< HEAD
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid "[[Release schedule|contribute/release_schedule]]"
-msgstr ""
-=======
msgstr "چرخهٔ انتشار\n"
#. type: Bullet: ' - '
msgid "[[Release schedule|contribute/release_schedule]]"
msgstr "[[زمان‌بندی انتشار|contribute/release_schedule]]"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid ""
" - [[Release process|contribute/release_process]]\n"
" - [[Manual test suite|contribute/release_process/test]]\n"
-<<<<<<< HEAD
-" - [[Automated test "
-"suite|contribute/release_process/test/automated_tests]]\n"
-msgstr ""
-=======
" - [[Automated test suite|contribute/release_process/test/automated_tests]]\n"
msgstr ""
" - [[روند انتشار|contribute/release_process]]\n"
" - [[مجموعهٔ آزمایش دستی|contribute/release_process/test]]\n"
" - [[مجموعهٔ آزمایش "
"خودکار|contribute/release_process/test/automated_tests]]\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "<a id=\"upstream\"></a>\n"
-<<<<<<< HEAD
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Relationship with upstream\n"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid "[[Relationship with upstream|contribute/relationship_with_upstream]]"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid "[[Improve Tails by working on Debian|contribute/how/debian]]"
-msgstr ""
-=======
msgstr "<a id=\"upstream\"></a>\n"
#. type: Title =
@@ -683,57 +455,21 @@ msgstr "[[رابطه با آپ‌استریم|contribute/relationship_with_upstr
#. type: Bullet: ' - '
msgid "[[Improve Tails by working on Debian|contribute/how/debian]]"
msgstr "[[بهبود تیلز با کار کردن روی دبیان|contribute/how/debian]]"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "<a id=\"collective-process\"></a>\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "<a id=\"collective-process\"></a>\n"
->>>>>>> web/10400-farsi-only
#. type: Title =
#, no-wrap
msgid "Collective process\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "روند جمعی\n"
->>>>>>> web/10400-farsi-only
#. type: Bullet: ' - '
msgid ""
"[[Calendar|contribute/calendar]] of releases, meetings, working sessions, "
"etc."
-<<<<<<< HEAD
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid "[[Code of conduct|contribute/working_together/code_of_conduct]]"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid ""
-"[[Contributors meetings|contribute/meetings]], and minutes from past "
-"meetings"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid "[[contribute/Low-hanging_fruit_sessions]]"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid ""
-"[[Marking a task as "
-"easy|contribute/working_together/criteria_for_easy_tasks]]"
-msgstr ""
-
-#. type: Bullet: ' - '
-msgid "[[Document progress|contribute/working_together/document_progress]]"
-msgstr ""
-=======
msgstr "[[تقویم|contribute/calendar]] زمان انتشار، جلسات، نشست‌های کاری و غیره."
#. type: Bullet: ' - '
@@ -759,24 +495,12 @@ msgstr ""
#. type: Bullet: ' - '
msgid "[[Document progress|contribute/working_together/document_progress]]"
msgstr "[[پیشرفت اسناد|contribute/working_together/document_progress]]"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid ""
" - Roles\n"
" - [[Front desk|contribute/working_together/roles/front_desk]]\n"
-<<<<<<< HEAD
-" - [[Release "
-"manager|contribute/working_together/roles/release_manager]]\n"
-" - [[Ticket "
-"gardener|contribute/working_together/roles/ticket_gardener]]\n"
-" - [[Sysadmins|contribute/working_together/roles/sysadmins]]\n"
-" - [[Technical "
-"writer|contribute/working_together/roles/technical_writer]]\n"
-" - [[Reports sent to sponsors|contribute/reports]]\n"
-msgstr ""
-=======
" - [[Release manager|contribute/working_together/roles/release_manager]]\n"
" - [[Ticket gardener|contribute/working_together/roles/ticket_gardener]]\n"
" - [[Sysadmins|contribute/working_together/roles/sysadmins]]\n"
@@ -786,31 +510,18 @@ msgstr ""
" - [[مدیر انتشار|contribute/working_together/roles/release_manager]]\n"
" - [[مسئول بلیت‌ها|contribute/working_together/roles/ticket_gardener]]\n"
" - [[مدیر سیستم|contribute/working_together/roles/sysadmins]]\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "<a id=\"talk\"></a>\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "<a id=\"talk\"></a>\n"
->>>>>>> web/10400-farsi-only
#. type: Title =
#, no-wrap
msgid "Talk with us\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "با ما تماس بگیرید\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid " [[!inline pages=\"contribute/talk\" raw=\"yes\"]]\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr " [[!inline pages=\"contribute/talk\" raw=\"yes\"]]\n"
->>>>>>> web/10400-farsi-only