summaryrefslogtreecommitdiffstats
path: root/wiki/src/news/Join_us_at_the_Tails_HackFest_2014.fa.po
diff options
context:
space:
mode:
authorsajolida <sajolida@pimienta.org>2015-12-23 15:21:43 +0000
committersajolida <sajolida@pimienta.org>2015-12-23 15:21:43 +0000
commit4c95bb2434c3d85a9a8c8ae14104a66afb4cd264 (patch)
treef65e7f480dd8258146d39f15be7a265033fe0d76 /wiki/src/news/Join_us_at_the_Tails_HackFest_2014.fa.po
parent5910a33eb75507ba37152785d1b6b0fbc7e2e72b (diff)
parentadaa0279f2683ad7d34bcf5e25679b6870acf54a (diff)
Merge branch 'web/10400-farsi-only'
Conflicts: wiki/src/about.fa.po wiki/src/bugs.fa.po wiki/src/contribute.fa.po wiki/src/contribute/build.mdwn wiki/src/contribute/how/donate.fa.po wiki/src/doc.fa.po wiki/src/doc/about.fa.po wiki/src/doc/about.index.fa.po wiki/src/doc/about/acknowledgments_and_similar_projects.fa.po wiki/src/doc/about/features.fa.po wiki/src/doc/about/finances.fa.po wiki/src/doc/about/fingerprint.fa.po wiki/src/doc/about/license.fa.po wiki/src/doc/about/openpgp_keys.fa.po wiki/src/doc/about/requirements.fa.po wiki/src/doc/about/tor.fa.po wiki/src/doc/about/trust.fa.po wiki/src/doc/about/warning.fa.po wiki/src/doc/advanced_topics.fa.po wiki/src/doc/advanced_topics.index.fa.po wiki/src/doc/advanced_topics/additional_software.fa.po wiki/src/doc/advanced_topics/cold_boot_attacks.fa.po wiki/src/doc/advanced_topics/lan.fa.po wiki/src/doc/advanced_topics/paperkey.fa.po wiki/src/doc/advanced_topics/virtualization.caution.fa.po wiki/src/doc/advanced_topics/virtualization.fa.po wiki/src/doc/advanced_topics/virtualization/boxes.fa.po wiki/src/doc/advanced_topics/virtualization/virt-manager.fa.po wiki/src/doc/advanced_topics/virtualization/virtualbox.fa.po wiki/src/doc/advanced_topics/wireless_devices.fa.po wiki/src/doc/anonymous_internet.fa.po wiki/src/doc/anonymous_internet.index.fa.po wiki/src/doc/anonymous_internet/Tor_Browser.fa.po wiki/src/doc/anonymous_internet/claws_mail.fa.po wiki/src/doc/anonymous_internet/claws_mail_to_icedove.fa.po wiki/src/doc/anonymous_internet/electrum.fa.po wiki/src/doc/anonymous_internet/i2p.fa.po wiki/src/doc/anonymous_internet/icedove.fa.po wiki/src/doc/anonymous_internet/icedove/account_creation.inline.fa.po wiki/src/doc/anonymous_internet/icedove/name.inline.fa.po wiki/src/doc/anonymous_internet/networkmanager.fa.po wiki/src/doc/anonymous_internet/pidgin.fa.po wiki/src/doc/anonymous_internet/unsafe_browser.fa.po wiki/src/doc/anonymous_internet/unsafe_browser/chroot.inline.fa.po wiki/src/doc/anonymous_internet/vidalia.fa.po wiki/src/doc/anonymous_internet/why_tor_is_slow.fa.po wiki/src/doc/encryption_and_privacy.fa.po wiki/src/doc/encryption_and_privacy.index.fa.po wiki/src/doc/encryption_and_privacy/FireGPG_susceptible_to_devastating_attacks.fa.po wiki/src/doc/encryption_and_privacy/checksums.fa.po wiki/src/doc/encryption_and_privacy/encrypted_volumes.fa.po wiki/src/doc/encryption_and_privacy/gpgapplet.fa.po wiki/src/doc/encryption_and_privacy/gpgapplet.warning.fa.po wiki/src/doc/encryption_and_privacy/gpgapplet/decrypt_verify.fa.po wiki/src/doc/encryption_and_privacy/gpgapplet/passphrase_encryption.fa.po wiki/src/doc/encryption_and_privacy/gpgapplet/public-key_cryptography.fa.po wiki/src/doc/encryption_and_privacy/keyringer.fa.po wiki/src/doc/encryption_and_privacy/manage_passwords.fa.po wiki/src/doc/encryption_and_privacy/secure_deletion.fa.po wiki/src/doc/encryption_and_privacy/truecrypt.fa.po wiki/src/doc/encryption_and_privacy/virtual_keyboard.fa.po wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.fa.po wiki/src/doc/first_steps.fa.po wiki/src/doc/first_steps.index.fa.po wiki/src/doc/first_steps/accessibility.fa.po wiki/src/doc/first_steps/bug_reporting.fa.po wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.fa.po wiki/src/doc/first_steps/dvd.fa.po wiki/src/doc/first_steps/installation.fa.po wiki/src/doc/first_steps/installation/manual.fa.po wiki/src/doc/first_steps/installation/manual.intro.fa.po wiki/src/doc/first_steps/installation/manual/linux.fa.po wiki/src/doc/first_steps/installation/manual/mac.fa.po wiki/src/doc/first_steps/installation/manual/windows.fa.po wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fa.po wiki/src/doc/first_steps/media.fa.po wiki/src/doc/first_steps/persistence.caution.fa.po wiki/src/doc/first_steps/persistence.fa.po wiki/src/doc/first_steps/persistence/change_passphrase.fa.po wiki/src/doc/first_steps/persistence/check_file_system.fa.po wiki/src/doc/first_steps/persistence/configure.fa.po wiki/src/doc/first_steps/persistence/copy.fa.po wiki/src/doc/first_steps/persistence/delete.fa.po wiki/src/doc/first_steps/persistence/recover_insecure.fa.po wiki/src/doc/first_steps/persistence/upgrade.fa.po wiki/src/doc/first_steps/persistence/use.fa.po wiki/src/doc/first_steps/persistence/warnings.fa.po wiki/src/doc/first_steps/reset.fa.po wiki/src/doc/first_steps/reset.intro.fa.po wiki/src/doc/first_steps/reset/linux.fa.po wiki/src/doc/first_steps/reset/mac.fa.po wiki/src/doc/first_steps/reset/windows.fa.po wiki/src/doc/first_steps/shutdown.fa.po wiki/src/doc/first_steps/start_tails.fa.po wiki/src/doc/first_steps/startup_options.fa.po wiki/src/doc/first_steps/startup_options/administration_password.fa.po wiki/src/doc/first_steps/startup_options/bridge_mode.fa.po wiki/src/doc/first_steps/startup_options/mac_spoofing.fa.po wiki/src/doc/first_steps/startup_options/network_configuration.fa.po wiki/src/doc/first_steps/startup_options/offline_mode.fa.po wiki/src/doc/first_steps/startup_options/windows_camouflage.fa.po wiki/src/doc/first_steps/upgrade.fa.po wiki/src/doc/get.index.fa.po wiki/src/doc/get/signing_key_transition.inline.fa.po wiki/src/doc/get/trusting_tails_signing_key.fa.po wiki/src/doc/get/verify_the_iso_image_using_gnome.fa.po wiki/src/doc/get/verify_the_iso_image_using_other_operating_systems.fa.po wiki/src/doc/get/verify_the_iso_image_using_the_command_line.fa.po wiki/src/doc/introduction.fa.po wiki/src/doc/sensitive_documents.fa.po wiki/src/doc/sensitive_documents.index.fa.po wiki/src/doc/sensitive_documents/graphics.fa.po wiki/src/doc/sensitive_documents/metadata.fa.po wiki/src/doc/sensitive_documents/office_suite.fa.po wiki/src/doc/sensitive_documents/persistence.fa.po wiki/src/doc/sensitive_documents/printing_and_scanning.fa.po wiki/src/doc/sensitive_documents/sound_and_video.fa.po wiki/src/doc/upgrade/error.fa.po wiki/src/doc/upgrade/error/check.fa.po wiki/src/doc/upgrade/error/download.fa.po wiki/src/doc/upgrade/error/install.fa.po wiki/src/download.fa.po wiki/src/getting_started.fa.po wiki/src/inc/release_notes/1.4.1.fa.po wiki/src/inc/release_notes/1.4.fa.po wiki/src/inc/release_notes/1.5.1.fa.po wiki/src/inc/release_notes/1.5.fa.po wiki/src/inc/release_notes/1.6.fa.po wiki/src/inc/release_notes/1.7.fa.po wiki/src/index.fa.po wiki/src/install.fa.po wiki/src/install/clone.fa.po wiki/src/install/debian.fa.po wiki/src/install/debian/clone/overview.fa.po wiki/src/install/debian/usb.fa.po wiki/src/install/debian/usb/overview.fa.po wiki/src/install/download.fa.po wiki/src/install/expert/usb.fa.po wiki/src/install/expert/usb/overview.fa.po wiki/src/install/inc/overview.fa.po wiki/src/install/inc/overview/vm.fa.po wiki/src/install/inc/router/clone.fa.po wiki/src/install/inc/steps/create_persistence.inline.fa.po wiki/src/install/inc/steps/download.inline.fa.po wiki/src/install/inc/steps/install_final.inline.fa.po wiki/src/install/inc/steps/install_tails_installer.inline.fa.po wiki/src/install/inc/steps/install_temporary_intro.inline.fa.po wiki/src/install/inc/steps/install_temporary_outro.inline.fa.po wiki/src/install/inc/steps/mac_startup_disks.inline.fa.po wiki/src/install/inc/steps/not_at_all.inline.fa.po wiki/src/install/inc/steps/not_entirely.inline.fa.po wiki/src/install/inc/steps/restart_first_time.inline.fa.po wiki/src/install/inc/steps/restart_second_time.inline.fa.po wiki/src/install/inc/steps/switch.inline.fa.po wiki/src/install/inc/steps/verify_up-to-date.inline.fa.po wiki/src/install/inc/steps/you_are_done.inline.fa.po wiki/src/install/inc/tails-installation-assistant.inline.fa.po wiki/src/install/linux.fa.po wiki/src/install/linux/clone/overview.fa.po wiki/src/install/linux/usb.fa.po wiki/src/install/linux/usb/overview.fa.po wiki/src/install/mac.fa.po wiki/src/install/mac/clone.fa.po wiki/src/install/mac/clone/overview.fa.po wiki/src/install/mac/dvd.fa.po wiki/src/install/mac/dvd/overview.fa.po wiki/src/install/mac/usb.fa.po wiki/src/install/mac/usb/overview.fa.po wiki/src/install/os.fa.po wiki/src/install/win.fa.po wiki/src/install/win/clone/overview.fa.po wiki/src/install/win/usb.fa.po wiki/src/install/win/usb/overview.fa.po wiki/src/misc/unsafe_browser_warning.fa.po wiki/src/news.fa.po wiki/src/news/IP_leakage_with_Icedove.fa.po wiki/src/news/Join_us_at_the_Tails_HackFest_2014.fa.po wiki/src/news/Mac_and_PC_UEFI_hardware_needed.fa.po wiki/src/news/On_0days_exploits_and_disclosure.fa.po wiki/src/news/Tails_HackFest_2014.fa.po wiki/src/news/amnesia_may_now_work_on_the_Mac.fa.po wiki/src/news/and_the_winner_is.fa.po wiki/src/news/bounties_2013_report.fa.po wiki/src/news/fpf_campaign.fa.po wiki/src/news/improve_the_infrastructure_behind_Tails.fa.po wiki/src/news/logo_contest.fa.po wiki/src/news/new_SSL_certificate.fa.po wiki/src/news/new_project_name.fa.po wiki/src/news/report_2011_01-02.fa.po wiki/src/news/report_2011_03-04.fa.po wiki/src/news/report_2011_05-06.fa.po wiki/src/news/report_2012_01-04.fa.po wiki/src/news/report_2012_07.fa.po wiki/src/news/report_2012_08.fa.po wiki/src/news/report_2012_09.fa.po wiki/src/news/report_2012_10.fa.po wiki/src/news/report_2012_11.fa.po wiki/src/news/report_2012_12.fa.po wiki/src/news/report_2013_01.fa.po wiki/src/news/report_2013_02.fa.po wiki/src/news/report_2013_03.fa.po wiki/src/news/report_2013_04.fa.po wiki/src/news/report_2013_05.fa.po wiki/src/news/report_2013_06.fa.po wiki/src/news/report_2013_07.fa.po wiki/src/news/report_2013_08.fa.po wiki/src/news/report_2013_09.fa.po wiki/src/news/report_2013_10.fa.po wiki/src/news/report_2013_11.fa.po wiki/src/news/report_2013_12.fa.po wiki/src/news/report_2014_01.fa.po wiki/src/news/report_2014_02.fa.po wiki/src/news/report_2014_03.fa.po wiki/src/news/report_2014_04.fa.po wiki/src/news/report_2014_05.fa.po wiki/src/news/report_2014_06-07.fa.po wiki/src/news/report_2015_01-02.fa.po wiki/src/news/report_2015_03.fa.po wiki/src/news/report_2015_04.fa.po wiki/src/news/report_2015_05.fa.po wiki/src/news/report_2015_06.fa.po wiki/src/news/report_2015_07.fa.po wiki/src/news/report_end_of_2014.fa.po wiki/src/news/signing_key_transition.fa.po wiki/src/news/spoof-mac.fa.po wiki/src/news/summit_2013.fa.po wiki/src/news/tails-support.fa.po wiki/src/news/tails-testers.fa.po wiki/src/news/test_0.13-rc1.fa.po wiki/src/news/test_0.14-rc1.fa.po wiki/src/news/test_0.14-rc2.fa.po wiki/src/news/test_0.15-rc1.fa.po wiki/src/news/test_0.16-rc1.fa.po wiki/src/news/test_0.17-rc1.fa.po wiki/src/news/test_0.17.2-rc1.fa.po wiki/src/news/test_0.18-rc1.fa.po wiki/src/news/test_0.19-rc1.fa.po wiki/src/news/test_0.20-rc1.fa.po wiki/src/news/test_0.21-rc1.fa.po wiki/src/news/test_0.22-rc1.fa.po wiki/src/news/test_0.22.1-rc1.fa.po wiki/src/news/test_0.23-rc1.fa.po wiki/src/news/test_1.0-rc1.fa.po wiki/src/news/test_1.1-beta1.fa.po wiki/src/news/test_1.1-rc1.fa.po wiki/src/news/test_1.2-rc1.fa.po wiki/src/news/test_1.3-rc1.fa.po wiki/src/news/test_1.4-rc1.fa.po wiki/src/news/test_1.5-rc1.fa.po wiki/src/news/test_1.7-rc1.fa.po wiki/src/news/test_UEFI.fa.po wiki/src/news/test_incremental_upgrades.fa.po wiki/src/news/thedaywefightback.fa.po wiki/src/news/usability_testing_2014_05.fa.po wiki/src/news/version_0.10.1.fa.po wiki/src/news/version_0.10.2.fa.po wiki/src/news/version_0.10.fa.po wiki/src/news/version_0.11.fa.po wiki/src/news/version_0.12.1.fa.po wiki/src/news/version_0.12.fa.po wiki/src/news/version_0.13.fa.po wiki/src/news/version_0.14.fa.po wiki/src/news/version_0.15.fa.po wiki/src/news/version_0.16.fa.po wiki/src/news/version_0.17.1.fa.po wiki/src/news/version_0.17.2.fa.po wiki/src/news/version_0.17.fa.po wiki/src/news/version_0.18.fa.po wiki/src/news/version_0.19.fa.po wiki/src/news/version_0.2.fa.po wiki/src/news/version_0.20.1.fa.po wiki/src/news/version_0.20.fa.po wiki/src/news/version_0.21.fa.po wiki/src/news/version_0.22.1.fa.po wiki/src/news/version_0.22.fa.po wiki/src/news/version_0.23.fa.po wiki/src/news/version_0.3.fa.po wiki/src/news/version_0.4.1.fa.po wiki/src/news/version_0.4.2.fa.po wiki/src/news/version_0.5.fa.po wiki/src/news/version_0.6.1.fa.po wiki/src/news/version_0.6.2.fa.po wiki/src/news/version_0.6.fa.po wiki/src/news/version_0.7.1.fa.po wiki/src/news/version_0.7.2.fa.po wiki/src/news/version_0.7.fa.po wiki/src/news/version_0.8.1.fa.po wiki/src/news/version_0.8.fa.po wiki/src/news/version_0.9.fa.po wiki/src/news/version_1.0.1.fa.po wiki/src/news/version_1.0.fa.po wiki/src/news/version_1.1.1.fa.po wiki/src/news/version_1.1.2.fa.po wiki/src/news/version_1.1.fa.po wiki/src/news/version_1.2.1.fa.po wiki/src/news/version_1.2.2.fa.po wiki/src/news/version_1.2.3.fa.po wiki/src/news/version_1.2.fa.po wiki/src/news/version_1.3.1.fa.po wiki/src/news/version_1.3.2.fa.po wiki/src/news/version_1.3.fa.po wiki/src/news/version_1.4.1.fa.po wiki/src/news/version_1.4.fa.po wiki/src/news/version_1.5.1.fa.po wiki/src/news/version_1.5.fa.po wiki/src/news/version_1.6.fa.po wiki/src/news/version_1.7.fa.po wiki/src/news/who_are_you_helping.fa.po wiki/src/news/windows_camouflage_jessie.fa.po wiki/src/press.fa.po wiki/src/press/media_appearances_2011.fa.po wiki/src/press/media_appearances_2012.fa.po wiki/src/press/media_appearances_2013.fa.po wiki/src/press/media_appearances_2014.fa.po wiki/src/press/media_appearances_2015.fa.po wiki/src/security.fa.po wiki/src/security/IP_address_leak_with_icedove.fa.po wiki/src/security/Iceweasel_exposes_a_rare_User-Agent.fa.po wiki/src/security/Numerous_security_holes_in_0.10.1.fa.po wiki/src/security/Numerous_security_holes_in_0.10.2.fa.po wiki/src/security/Numerous_security_holes_in_0.10.fa.po wiki/src/security/Numerous_security_holes_in_0.11.fa.po wiki/src/security/Numerous_security_holes_in_0.12.1.fa.po wiki/src/security/Numerous_security_holes_in_0.13.fa.po wiki/src/security/Numerous_security_holes_in_0.14.fa.po wiki/src/security/Numerous_security_holes_in_0.15.fa.po wiki/src/security/Numerous_security_holes_in_0.16.fa.po wiki/src/security/Numerous_security_holes_in_0.17.1.fa.po wiki/src/security/Numerous_security_holes_in_0.17.2.fa.po wiki/src/security/Numerous_security_holes_in_0.17.fa.po wiki/src/security/Numerous_security_holes_in_0.18.fa.po wiki/src/security/Numerous_security_holes_in_0.19.fa.po wiki/src/security/Numerous_security_holes_in_0.20.1.fa.po wiki/src/security/Numerous_security_holes_in_0.20.fa.po wiki/src/security/Numerous_security_holes_in_0.21.fa.po wiki/src/security/Numerous_security_holes_in_0.22.1.fa.po wiki/src/security/Numerous_security_holes_in_0.22.fa.po wiki/src/security/Numerous_security_holes_in_0.23.fa.po wiki/src/security/Numerous_security_holes_in_0.5.fa.po wiki/src/security/Numerous_security_holes_in_0.6.1.fa.po wiki/src/security/Numerous_security_holes_in_0.6.2.fa.po wiki/src/security/Numerous_security_holes_in_0.6.fa.po wiki/src/security/Numerous_security_holes_in_0.7.1.fa.po wiki/src/security/Numerous_security_holes_in_0.7.2.fa.po wiki/src/security/Numerous_security_holes_in_0.7.fa.po wiki/src/security/Numerous_security_holes_in_0.8.1.fa.po wiki/src/security/Numerous_security_holes_in_0.8.fa.po wiki/src/security/Numerous_security_holes_in_0.9.fa.po wiki/src/security/Numerous_security_holes_in_1.0.1.fa.po wiki/src/security/Numerous_security_holes_in_1.0.fa.po wiki/src/security/Numerous_security_holes_in_1.1.1.fa.po wiki/src/security/Numerous_security_holes_in_1.1.2.fa.po wiki/src/security/Numerous_security_holes_in_1.1.fa.po wiki/src/security/Numerous_security_holes_in_1.2.2.fa.po wiki/src/security/Numerous_security_holes_in_1.2.3.fa.po wiki/src/security/Numerous_security_holes_in_1.2.fa.po wiki/src/security/Numerous_security_holes_in_1.3.1.fa.po wiki/src/security/Numerous_security_holes_in_1.3.2.fa.po wiki/src/security/Numerous_security_holes_in_1.3.fa.po wiki/src/security/Numerous_security_holes_in_1.4.1.fa.po wiki/src/security/Numerous_security_holes_in_1.4.fa.po wiki/src/security/Numerous_security_holes_in_1.5.1.fa.po wiki/src/security/Numerous_security_holes_in_1.5.fa.po wiki/src/security/Numerous_security_holes_in_1.6.fa.po wiki/src/security/Numerous_security_holes_in_previous_amnesia_versions.fa.po wiki/src/security/Security_hole_in_I2P_0.9.13.fa.po wiki/src/security/Upgrade_Tor.fa.po wiki/src/security/claws_mail_leaks_plaintext_to_imap.fa.po wiki/src/security/ineffective_firewall-level_Tor_enforcement.fa.po wiki/src/security/use_of_cleartext_swap_partitions_on_local_hard_disks.fa.po wiki/src/security/use_of_untrusted_Live_system_found_on_local_hard-disk.fa.po wiki/src/sidebar.fa.po wiki/src/support.fa.po wiki/src/support/chat.fa.po wiki/src/support/faq.fa.po wiki/src/support/known_issues.fa.po wiki/src/support/learn.fa.po wiki/src/support/learn/intro.inline.fa.po wiki/src/support/tails-support.fa.po wiki/src/support/talk.fa.po wiki/src/support/talk/languages.inline.fa.po wiki/src/todo.fa.po wiki/src/torrents.fa.po wiki/src/upgrade.fa.po wiki/src/upgrade/clone.fa.po wiki/src/upgrade/clone/overview.fa.po wiki/src/upgrade/tails.fa.po wiki/src/upgrade/tails/overview.fa.po wiki/src/wishlist.fa.po
Diffstat (limited to 'wiki/src/news/Join_us_at_the_Tails_HackFest_2014.fa.po')
-rw-r--r--wiki/src/news/Join_us_at_the_Tails_HackFest_2014.fa.po51
1 files changed, 51 insertions, 0 deletions
diff --git a/wiki/src/news/Join_us_at_the_Tails_HackFest_2014.fa.po b/wiki/src/news/Join_us_at_the_Tails_HackFest_2014.fa.po
index 4456d63..e054111 100644
--- a/wiki/src/news/Join_us_at_the_Tails_HackFest_2014.fa.po
+++ b/wiki/src/news/Join_us_at_the_Tails_HackFest_2014.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,21 +16,49 @@ 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"
+"POT-Creation-Date: 2015-07-28 09:53+0200\n"
+"PO-Revision-Date: 2015-10-16 15:53+0000\n"
+"Last-Translator: sprint5 <translation5@451f.org>\n"
+"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/join_us_a"
+"t_the_tails_hackfest_2014/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=\"Join us at the Tails HackFest, 2014!\"]]\n"
+<<<<<<< HEAD
msgstr ""
+=======
+msgstr "[[!meta title=\"به ما در هک‌فست ۲۰۱۴ بپیوندید!\"]]\n"
+>>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "[[!meta date=\"Fri Jul 4 21:00:00 2014\"]]\n"
+<<<<<<< HEAD
msgstr ""
+=======
+msgstr "[[!meta date=\"Fri Jul 4 21:00:00 2014\"]]\n"
+>>>>>>> web/10400-farsi-only
#. type: Plain text
#, no-wrap
msgid "[[!tag announce]]\n"
+<<<<<<< HEAD
msgstr ""
+=======
+msgstr "[[!tag announce]]\n"
+>>>>>>> web/10400-farsi-only
#. type: Plain text
msgid ""
@@ -38,6 +67,13 @@ msgid ""
"designer, a system administrator or just plain interested, come learn about "
"the challenges faced by Tails, and how you can be part of the solution."
msgstr ""
+<<<<<<< HEAD
+=======
+"در روزهای پنجم و ششم جولای به ما بپیوندید تا بتوانیم ناشناسی آنلاین و حریم "
+"خصوصی دیجیتال را برای همه ممکن کنیم! چه نویسنده‌اید یا برنامه‌نویس، طراح، "
+"مدیر سیستم یا حتی اگر تنها فردی علاقه‌مند هستید، بیایید و در مورد چالش‌های "
+"پیش روی تیلز و این که چطور می‌توانید بخشی از راه‌حل باشید اطلاعات کسب کنید."
+>>>>>>> web/10400-farsi-only
#. type: Plain text
msgid ""
@@ -45,15 +81,30 @@ msgid ""
"more usable and more secure. This open event will be an intense mix of "
"teaching, drawing, coding, sharing, learning and celebrating."
msgstr ""
+<<<<<<< HEAD
+=======
+"هک‌فست تیلز هر کسی که علاقه‌مند به کاربردپذیرتر و امن‌تر شدن تیلز است گرد هم "
+"می‌آورد. این رخداد همگانی ترکیبی از آموزش، کشیدن، کدنویسی، اشتراک‌گذاری، "
+"یادگیری و جشن گرفتن است."
+>>>>>>> web/10400-farsi-only
#. type: Plain text
msgid ""
"Learn more about it: [[logistics, contact, registration, scheduling "
"information, etc.|blueprint/HackFest_2014_Paris]]"
msgstr ""
+<<<<<<< HEAD
+=======
+"بیشتر در مورد آن اطلاعات کسب کنید: [[آمادگاری، ارتباط، ثبت، زمان‌بندی "
+"اطلاعات و غیره.|blueprint/HackFest_2014_Paris]]"
+>>>>>>> web/10400-farsi-only
#. type: Plain text
msgid ""
"Many thanks to Debian, IRILL, Mozilla and the Tor project for supporting "
"this event!"
msgstr ""
+<<<<<<< HEAD
+=======
+"تشکر بسیار از دبیان، ایریل، موزیلا و پروژهٔ تور برای حمایت از این رخداد!"
+>>>>>>> web/10400-farsi-only