summaryrefslogtreecommitdiffstats
path: root/wiki/src/doc/upgrade
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/doc/upgrade
parent4c95bb2434c3d85a9a8c8ae14104a66afb4cd264 (diff)
Fix badly resolved conflicts
Diffstat (limited to 'wiki/src/doc/upgrade')
-rw-r--r--wiki/src/doc/upgrade/error.fa.po19
-rw-r--r--wiki/src/doc/upgrade/error/check.fa.po4
-rw-r--r--wiki/src/doc/upgrade/error/download.fa.po4
-rw-r--r--wiki/src/doc/upgrade/error/install.fa.po4
4 files changed, 0 insertions, 31 deletions
diff --git a/wiki/src/doc/upgrade/error.fa.po b/wiki/src/doc/upgrade/error.fa.po
index 27de856..4831fa2 100644
--- a/wiki/src/doc/upgrade/error.fa.po
+++ b/wiki/src/doc/upgrade/error.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,13 +18,8 @@ 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 "[[!map pages=\"doc/upgrade/error/*\"]]\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "[[!map pages=\"doc/upgrade/error/*\"]]\n"
->>>>>>> web/10400-farsi-only
diff --git a/wiki/src/doc/upgrade/error/check.fa.po b/wiki/src/doc/upgrade/error/check.fa.po
index f198782..87ead30 100644
--- a/wiki/src/doc/upgrade/error/check.fa.po
+++ b/wiki/src/doc/upgrade/error/check.fa.po
@@ -7,11 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2015-12-23 15:02+0100\n"
-=======
"POT-Creation-Date: 2015-07-28 09:54+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"
diff --git a/wiki/src/doc/upgrade/error/download.fa.po b/wiki/src/doc/upgrade/error/download.fa.po
index f77b326..60c522d 100644
--- a/wiki/src/doc/upgrade/error/download.fa.po
+++ b/wiki/src/doc/upgrade/error/download.fa.po
@@ -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-07-28 09:53+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"
diff --git a/wiki/src/doc/upgrade/error/install.fa.po b/wiki/src/doc/upgrade/error/install.fa.po
index 0de3012..61c89b0 100644
--- a/wiki/src/doc/upgrade/error/install.fa.po
+++ b/wiki/src/doc/upgrade/error/install.fa.po
@@ -7,11 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2015-12-23 15:02+0100\n"
-=======
"POT-Creation-Date: 2015-07-28 09:53+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"