Commit 232d8750 authored by s1udge's avatar s1udge 💬

Merge branch 'master' of git.parrotsec.org:parrot-organization/parrotsec.org

parents b1fed5d5 49cdeb42
......@@ -54,8 +54,8 @@ download<?php require(__DIR__ . '/include/parrot.inc.php'); ?>
<li class="list-group-item"><i class="icon-ok text-info"></i>Always install the latest version of the system</li>
</ul>
<div class="panel-footer">
<a class="btn btn-lg btn-block btn-info" target="_blank" href="https://download.parrotsec.org/parrot/iso/4.5/Parrot-netinst-gtk-4.5_amd64.iso">netinstall amd64</a><br>
<a class="btn btn-lg btn-block btn-info" target="_blank" href="https://download.parrotsec.org/parrot/iso/4.5/Parrot-netinst-gtk-4.5_i386.iso">netinstall i386</a><br>
<a class="btn btn-lg btn-block btn-info" target="_blank" href="https://download.parrotsec.org/parrot/iso/4.6/Parrot-netinstall-gtk-4.6_amd64.iso">netinstall amd64</a><br>
<a class="btn btn-lg btn-block btn-info" target="_blank" href="https://download.parrotsec.org/parrot/iso/4.6/Parrot-netinstall-gtk-4.6_i386.iso">netinstall i386</a><br>
<a class="btn btn-lg btn-block btn-info" target="_blank" href="https://download.parrotsec.org/parrot/dists/stable/main/installer-arm64/current/images/">netinstall arm64</a><br>
<a class="btn btn-lg btn-block btn-info" target="_blank" href="https://download.parrotsec.org/parrot/dists/stable/main/installer-armhf/current/images/">netinstall armhf</a><br>
</div>
......
......@@ -13,11 +13,7 @@
</div><br/><br/><br/>
<div class="row">
<<<<<<< HEAD
<div class="col-lg-4 col-md-4 text-center">
=======
<div class="col-lg-4 col-md-4 col-md-offset-2 col-lg-offset-2 text-center">
>>>>>>> 23d620e2c0ce9547668562fa21be60cdc46ae395
<div class="panel download panel-blue">
<div class="panel-heading arrow_box text-center">
<h3>Live+Installer ISO</h3>
......@@ -46,7 +42,6 @@
</div>
<div class="col-lg-4 col-md-4 text-center">
<<<<<<< HEAD
<div class="panel download panel-blue">
<div class="panel-heading arrow_box text-center">
<h3>Live+Installer ISO</h3>
......@@ -57,7 +52,7 @@
<ul class="list-group list-group-flush text-center">
<li class="list-group-item"><i class="icon-ok text-info"></i>Interface: KDE Plasma</li>
<li class="list-group-item"><i class="icon-ok text-info"></i>Format: ISO Hybrid</li>
<li class="list-group-item"><i class="icon-ok text-info"></i>Size: 2GB</li>
<li class="list-group-item"><i class="icon-ok text-info"></i>Size: 4GB</li>
</ul>
<div class="panel-footer">
<a class="btn btn-lg btn-block btn-info" target="_blank" href="https://download.parrotsec.org/parrot/iso/<?php echo CONFIG_SYSTEM_VERSION; ?>/Parrot-kde-security-<?php echo CONFIG_SYSTEM_VERSION; ?>_amd64.iso">Download</a><br>
......@@ -69,8 +64,6 @@
</div>
<div class="col-lg-4 col-md-4 text-center">
=======
>>>>>>> 23d620e2c0ce9547668562fa21be60cdc46ae395
<div class="panel download panel-blue">
<div class="panel-heading arrow_box text-center">
<h3>Virtual Appliance</h3>
......
......@@ -95,17 +95,13 @@ $lang['download-29'] = 'Debian 10 Buster';
$lang['download-30'] = 'مدل انتشار';
$lang['download-31'] = 'انتشار رولینگ';
$lang['download-32'] = 'محیط دسکتاپ پیش فرض';
<<<<<<< HEAD
$lang['download-33'] = 'MATE 1.20/KDE Plasma';
=======
$lang['download-33'] = 'MATE 1.20';
>>>>>>> 23d620e2c0ce9547668562fa21be60cdc46ae395
$lang['download-34'] = 'Sandbox';
$lang['download-35'] = 'Office Suite';
$lang['download-36'] = 'LibreOffice 6.x';
$lang['download-37'] = 'Abiword/Gnumeric';
$lang['download-38'] = 'Web Suite';
$lang['download-39'] = 'Firefox 65 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum5 Quantum';
$lang['download-39'] = 'Firefox 65';
$lang['download-40'] = 'Epiphany (may include firefox-esr)';
$lang['download-41'] = 'Adblockers and web protection';
$lang['download-42'] = 'Ublock Origin + NoScript + Privacy Badger';
......
......@@ -95,11 +95,7 @@ $lang['download-29'] = 'Debian 10 Buster';
$lang['download-30'] = 'Modelo de Lançamento';
$lang['download-31'] = 'Rolling Release';
$lang['download-32'] = 'Ambiente Desktop Padrão';
<<<<<<< HEAD
$lang['download-33'] = 'MATE 1,20/KDE Plasma';
=======
$lang['download-33'] = 'MATE 1,20';
>>>>>>> 23d620e2c0ce9547668562fa21be60cdc46ae395
$lang['download-34'] = 'Sandbox';
$lang['download-35'] = 'Office Suite';
$lang['download-36'] = 'LibreOffice 6.x';
......
......@@ -91,11 +91,7 @@ $lang['download-29'] = 'Debian 10 Buster';
$lang['download-30'] = 'Модель релиза';
$lang['download-31'] = 'Rolling Release';
$lang['download-32'] = 'Рабочее окружение по умолчанию';
<<<<<<< HEAD
$lang['download-33'] = 'MATE 1.20/KDE Plasma';
=======
$lang['download-33'] = 'MATE 1.20';
>>>>>>> 23d620e2c0ce9547668562fa21be60cdc46ae395
$lang['download-34'] = 'Sandbox';
$lang['download-35'] = 'Набор Office';
$lang['download-36'] = 'LibreOffice 6.x';
......
......@@ -95,11 +95,7 @@ $lang['download-29'] = 'Debian 10 Buster';
$lang['download-30'] = 'Yayın Modeli';
$lang['download-31'] = 'Rolling Release';
$lang['download-32'] = 'Varsayılan Masaüstü Ortamı';
<<<<<<< HEAD
$lang['download-33'] = 'MATE 1.20/KDE Plasma';
=======
$lang['download-33'] = 'MATE 1.20';
>>>>>>> 23d620e2c0ce9547668562fa21be60cdc46ae395
$lang['download-34'] = 'Sandbox';
$lang['download-35'] = 'Office Suite';
$lang['download-36'] = 'LibreOffice 6.x';
......
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