Commit 3ba38867 authored by Tails developers's avatar Tails developers
Browse files

Merge branch 'devel' into feature/tails-greeter

parents 399ab6b4 a71c3bac
......@@ -122,7 +122,7 @@ for LANG_CODE in ${AMNESIA_SUPPORTED_LANGUAGES}; do
echo ' menu default' >> "${CFG_SNIPPET}"
fi
echo "${ORIG_KERNEL}" >> "${CFG_SNIPPET}"
echo "${ORIG_APPEND} ${LANG_APPEND}" >> "${CFG_SNIPPET}"
echo "${ORIG_APPEND} ${LANG_APPEND} " >> "${CFG_SNIPPET}"
cat "${CFG_SNIPPET}" >> "${SYSLINUX_LIVE_CFG}"
rm -f "${CFG_SNIPPET}"
......
......@@ -146,11 +146,11 @@ Package: linux-headers-2.6-486
Pin: release o=Debian,a=unstable
Pin-Priority: 999
Package: linux-headers-3.2.0-1-common
Package: linux-headers-3.2.0-2-common
Pin: release o=Debian,a=unstable
Pin-Priority: 999
Package: linux-headers-3.2.0-1-486
Package: linux-headers-3.2.0-2-486
Pin: release o=Debian,a=unstable
Pin-Priority: 999
......@@ -162,7 +162,7 @@ Package: linux-image-2.6-486
Pin: release o=Debian,a=unstable
Pin-Priority: 999
Package: linux-image-3.2.0-1-486
Package: linux-image-3.2.0-2-486
Pin: release o=Debian,a=unstable
Pin-Priority: 999
......
......@@ -8,4 +8,5 @@ apt-get --yes install -t squeeze-backports \
xserver-xorg-core \
xserver-xorg-input-all \
xserver-xorg-video-all
apt-get --yes install -t squeeze-backports libgl1-mesa-dri libgl1-mesa-glx
apt-get --yes install -t squeeze-backports libgl1-mesa-dri libgl1-mesa-glx \
libglu1-mesa libdrm-radeon1
......@@ -53,7 +53,7 @@ use Net::SSLeay;
BEGIN {
IO::Socket::SSL::set_ctx_defaults(
verify_mode => Net::SSLeay->VERIFY_PEER(),
ca_file => '/etc/ssl/certs/cacert.org.pem',
ca_file => '/etc/ssl/certs/UTN_USERFirst_Hardware_Root_CA.pem',
);
}
use LWP::UserAgent; # needs to be *after* IO::Socket::SSL's initialization
......
......@@ -3,68 +3,68 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-12-14 00:35+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"PO-Revision-Date: 2012-03-03 08:05-0000\n"
"Last-Translator: anon <anon@anon.anon>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: config/chroot_local-includes/usr/local/bin/gpgApplet:116
msgid "OpenPGP encryption applet"
msgstr ""
msgstr "بازکردن اپلت OpenPGP"
#: config/chroot_local-includes/usr/local/bin/gpgApplet:119
msgid "Exit"
msgstr ""
msgstr "خروج"
#: config/chroot_local-includes/usr/local/bin/gpgApplet:121
msgid "About"
msgstr ""
msgstr "درباره"
#: config/chroot_local-includes/usr/local/bin/gpgApplet:174
msgid "En_crypt Clipboard"
msgstr ""
msgstr "ـرمز کردن Clipboard"
#: config/chroot_local-includes/usr/local/bin/gpgApplet:179
msgid "_Decrypt/Verify Clipboard"
msgstr ""
msgstr "رمزـگشایی/تائید Clipboard"
#: config/chroot_local-includes/usr/local/bin/gpgApplet:216
msgid "The clipboard does not contain valid input data."
msgstr ""
msgstr "Clipboard هیچ داده معتبری ندارد"
#: config/chroot_local-includes/usr/local/bin/gpgApplet:314
msgid "GnuPG encryption error"
msgstr ""
msgstr "خطا در رمزنگاری GnuPG "
#: config/chroot_local-includes/usr/local/bin/gpgApplet:357
msgid "GnuPG decryption/verification error"
msgstr ""
msgstr "خطا در رمزگشایی/تائید رمز GnuPG"
#: config/chroot_local-includes/usr/local/bin/gpgApplet:374
msgid "Therefore, it cannot be encrypted."
msgstr ""
msgstr "از این رو، نمی تواند به رمز در آورده شود."
#: config/chroot_local-includes/usr/local/bin/gpgApplet:390
msgid "Therefore, it cannot be decrypted."
msgstr ""
msgstr "از این رو نمی تواند از رمز گشایی شود."
#: config/chroot_local-includes/usr/local/bin/gpgApplet:423
msgid "GnuPG results"
msgstr ""
msgstr "نتایج GnuPG"
#: config/chroot_local-includes/usr/local/bin/gpgApplet:429
msgid "Here is the GnuPG output:"
msgstr ""
msgstr "خروجی GnuPG بدین شکل است:"
#: config/chroot_local-includes/usr/local/bin/gpgApplet:454
msgid "While it were at it, GnuPG also mentionned in passing:"
msgstr ""
......@@ -3,30 +3,28 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-12-30 11:18+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"PO-Revision-Date: 2012-03-03 08:04-0000\n"
"Last-Translator: anon <anon@anon.anon>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:55
msgid "Synchronizing the system's clock"
msgstr ""
msgstr "در حال همزمان کردن ساعت سیستم"
#: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:56
msgid ""
"Tor needs an accurate clock to work properly, especially for Hidden "
"Services. Please wait..."
msgstr ""
msgid "Tor needs an accurate clock to work properly, especially for Hidden Services. Please wait..."
msgstr "تور برای درست کار کاردن، مخصوصا برای خدمات مخفی به یک ساعت دقیق احتیاج دارد، لطفا صبر کنید..."
#: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:103
msgid "Failed to synchronize the clock!"
msgstr ""
msgstr "همزمان سازی ساعت موفقیت آمیز نبود!"
......@@ -3,33 +3,33 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-12-14 00:35+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"PO-Revision-Date: 2012-02-25 14:52+0330\n"
"Last-Translator: shamsolah <shamsolah@mailinator.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: config/chroot_local-includes/usr/local/bin/tails-security-check:86
#, perl-format
msgid "Unparseable line in %s"
msgstr ""
msgstr "خط غیر قابل تشخیص در %s"
#: config/chroot_local-includes/usr/local/bin/tails-security-check:113
msgid "atom_str was passed an undefined argument"
msgstr ""
msgstr "به atom_str آرگومان تعریف نشده ای ارسال شده"
#: config/chroot_local-includes/usr/local/bin/tails-security-check:177
msgid "Empty fetched feed."
msgstr ""
msgstr "خوراک دریافت شده خالی است."
#: config/chroot_local-includes/usr/local/bin/tails-security-check:194
msgid "This version of Tails has known security issues:"
msgstr ""
msgstr "این نسخه از Tails این مشکلات امنیت شناخته شده را دارد:"
......@@ -3,32 +3,28 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-12-14 00:35+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2011-07-09 15:40+0200\n"
"PO-Revision-Date: 2012-02-25 14:55+0330\n"
"Last-Translator: shamsolah <shamsolah@mailinator.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:53
msgid "Warning: virtual machine detected!"
msgstr ""
msgstr "هشدار: ماشین مجازی کشف شد!"
#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:55
msgid ""
"Both the host operating system and the virtualization software are able to "
"monitor what you are doing in Tails."
msgstr ""
msgid "Both the host operating system and the virtualization software are able to monitor what you are doing in Tails."
msgstr "هم سیستم میزبان و هم نرم افزار مجازی سازی می توانند هر کاری که در Tails انجام می دهید، مشاهده کنند."
#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:57
msgid ""
"<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/"
"virtualization.en.html'>Learn more...</a>"
msgstr ""
msgid "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html'>Learn more...</a>"
msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html'>بیشتر بدانید...</a>"
......@@ -171,6 +171,7 @@ sshfs
system-config-printer
synaptic
totem-plugins
traverso
ttf-dejavu
ttf-liberation
tcpdump
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment