summaryrefslogtreecommitdiffstats
path: root/wiki/src/doc/encryption_and_privacy/gpgapplet.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/doc/encryption_and_privacy/gpgapplet.fa.po
parent4c95bb2434c3d85a9a8c8ae14104a66afb4cd264 (diff)
Fix badly resolved conflicts
Diffstat (limited to 'wiki/src/doc/encryption_and_privacy/gpgapplet.fa.po')
-rw-r--r--wiki/src/doc/encryption_and_privacy/gpgapplet.fa.po46
1 files changed, 0 insertions, 46 deletions
diff --git a/wiki/src/doc/encryption_and_privacy/gpgapplet.fa.po b/wiki/src/doc/encryption_and_privacy/gpgapplet.fa.po
index bda3a18..eb4802a 100644
--- a/wiki/src/doc/encryption_and_privacy/gpgapplet.fa.po
+++ b/wiki/src/doc/encryption_and_privacy/gpgapplet.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,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=\"Tails OpenPGP Applet\"]]\n"
-<<<<<<< HEAD
-msgstr ""
-=======
msgstr "[[!meta title=\"برنامک اپن‌پی‌جی‌پی تیلز\"]]\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
@@ -51,13 +32,10 @@ msgid ""
"using\n"
"OpenPGP.\n"
msgstr ""
-<<<<<<< HEAD
-=======
"تیلز یک برنامک اختصاصی به نام <span\n"
"class=\"application\">برنامک اپن‌پی‌جی‌پی تیلز</span> برای دست‌کاری متن از "
"طریق اُپن‌پی‌جی‌پی \n"
"دارد.\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
@@ -65,11 +43,8 @@ msgid ""
"[[!inline pages=\"doc/encryption_and_privacy/gpgapplet.warning\" "
"raw=\"yes\"]]\n"
msgstr ""
-<<<<<<< HEAD
-=======
"[[!inline pages=\"doc/encryption_and_privacy/gpgapplet.warning\" raw=\"بله\""
"]]\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
@@ -77,11 +52,8 @@ msgid ""
"<span class=\"application\">Tails OpenPGP Applet</span> is located in the "
"notification area.\n"
msgstr ""
-<<<<<<< HEAD
-=======
"<span class=\"application\">برنامک اُپن‌پی‌جی‌پی تیلز</span> در بخش آگهی "
"قرار دارد.\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
@@ -90,56 +62,38 @@ msgid ""
"of\n"
"text\"]]\n"
msgstr ""
-<<<<<<< HEAD
-=======
"[[!img gpgapplet_with_text.png link=no alt=\"برنامک اُپن‌پی‌جی‌پی تیلز با خط‌"
"های متنی\"]]\n"
->>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "With <span class=\"application\">Tails OpenPGP Applet</span> you can:\n"
msgstr ""
-<<<<<<< HEAD
-=======
"با <span class=\"application\">برنامک اُپن‌پی‌جی‌پی تیلز</span> می‌توانید:\n"
->>>>>>> web/10400-farsi-only
#. type: Bullet: ' - '
msgid ""
"[[Encrypt text with a "
"passphrase|encryption_and_privacy/gpgapplet/passphrase_encryption]]"
msgstr ""
-<<<<<<< HEAD
-=======
"[[متن را با یک گذرواژه رمزگذاری "
"کنید|encryption_and_privacy/gpgapplet/passphrase_encryption]]"
->>>>>>> web/10400-farsi-only
#. type: Bullet: ' - '
msgid ""
"[[Encrypt and sign text with a public "
"key|encryption_and_privacy/gpgapplet/public-key_cryptography]]"
msgstr ""
-<<<<<<< HEAD
-=======
"[[متن را با یک کلید عمومی رمزگذاری و امضا "
"کنید|encryption_and_privacy/gpgapplet/public-key_cryptography]]"
->>>>>>> web/10400-farsi-only
#. type: Bullet: ' - '
msgid "[[Decrypt and verify text|encryption_and_privacy/gpgapplet/decrypt_verify]]"
msgstr ""
-<<<<<<< HEAD
-=======
"[[متن را رمزگشایی و تأیید "
"کنید|encryption_and_privacy/gpgapplet/decrypt_verify]]"
->>>>>>> web/10400-farsi-only
#. type: Plain text
msgid "Note that the applet doesn't manage your keys, that is done by Seahorse."
msgstr ""
-<<<<<<< HEAD
-=======
"در خاطر داشته باشید که کلیدهای شما توسط Seahorse مدیریت می‌شود، نه برنامک."
->>>>>>> web/10400-farsi-only