summaryrefslogtreecommitdiffstats
path: root/wiki/src/bugs.fa.po
diff options
context:
space:
mode:
Diffstat (limited to 'wiki/src/bugs.fa.po')
-rw-r--r--wiki/src/bugs.fa.po32
1 files changed, 32 insertions, 0 deletions
diff --git a/wiki/src/bugs.fa.po b/wiki/src/bugs.fa.po
index 09a8e87..83eb05a 100644
--- a/wiki/src/bugs.fa.po
+++ b/wiki/src/bugs.fa.po
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
+<<<<<<< HEAD
#, fuzzy
msgid ""
msgstr ""
@@ -15,20 +16,51 @@ msgstr ""
"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"
+"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
+"POT-Creation-Date: 2015-07-28 09:53+0200\n"
+"PO-Revision-Date: 2015-09-29 14:14+0000\n"
+"Last-Translator: Sprint 1 <translation1@451f.org>\n"
+"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/bugs/fa/>"
+"\n"
+"Language: fa\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"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