summaryrefslogtreecommitdiffstats
path: root/wiki/src/bugs.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/bugs.fa.po
parent4c95bb2434c3d85a9a8c8ae14104a66afb4cd264 (diff)
Fix badly resolved conflicts
Diffstat (limited to 'wiki/src/bugs.fa.po')
-rw-r--r--wiki/src/bugs.fa.po25
1 files changed, 0 insertions, 25 deletions
diff --git a/wiki/src/bugs.fa.po b/wiki/src/bugs.fa.po
index 83eb05a..7987faf 100644
--- a/wiki/src/bugs.fa.po
+++ b/wiki/src/bugs.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,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