Merge branch 'master' into i18n

This commit is contained in:
2019-08-24 17:44:31 -05:00
193 changed files with 990 additions and 481 deletions

View File

@ -4,22 +4,32 @@
<strong>{% t pc_os.ms_apple_warning %}</strong>
</div>
{%- capture pc_os_qubesos_labels -%}warning:contrib:{% t global.contrib %}{%- endcapture -%}
{%- capture pc_os_contrib_labels -%}warning:contrib:{% t global.contrib %}{%- endcapture -%}
{%- capture pc_os_qubesos_descr -%}{% t pc_os.qubesos_descr %}{%- endcapture -%}
{%- capture pc_os_debian_descr -%}{% t pc_os.debian_descr %}{%- endcapture -%}
{%- capture pc_os_trisquel_descr -%}{% t pc_os.trisquel_descr %}{%- endcapture -%}
{%- capture pc_os_fedora_descr -%}{% t pc_os.fedora_descr %}{%- endcapture -%}
{% include cardv2.html
title="Qubes OS"
image="/assets/img/tools/Qubes-OS.png"
description=pc_os_qubesos_descr
badges="info:Xen"
labels=pc_os_qubesos_labels
labels=pc_os_contrib_labels
website="https://www.qubes-os.org/"
github="https://github.com/QubesOS"
tor="http://qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/"
%}
{% include cardv2.html
title="Fedora Workstation"
image="/assets/img/tools/Fedora.png"
description=pc_os_fedora_descr
badges="info:GNU/Linux"
labels=pc_os_contrib_labels
website="https://getfedora.org/"
git="https://src.fedoraproject.org/"
%}
{% include cardv2.html
title="Debian"
image="/assets/img/tools/Debian.png"
@ -30,15 +40,6 @@ git="https://salsa.debian.org/qa/debsources"
tor="http://sejnfjrq6szgca7v.onion"
%}
{% include cardv2.html
title="Trisquel"
image="/assets/img/tools/Trisquel.png"
description=pc_os_trisquel_descr
badges="info:GNU/Linux"
website="https://trisquel.info/"
git="https://devel.trisquel.info/groups/trisquel"
%}
<h3>{% t pc_os.warning %}</h3>
<ul>
@ -49,6 +50,7 @@ git="https://devel.trisquel.info/groups/trisquel"
<ul>
<li><a href="https://www.openbsd.org/">OpenBSD</a> <span class="badge badge-info">BSD</span> - {% t pc_os.openbsd_descr %}</li>
<li><a href="https://www.archlinux.org/">Arch Linux</a> <span class="badge badge-info">GNU/Linux</span> - {% t pc_os.arch_descr %} <a href="https://www.parabola.nu/">Parabola</a> {% t pc_os.parabola_descr %}</li>
<li><a href="https://www.archlinux.org/">Arch Linux</a> <span class="badge badge-info">GNU/Linux</span> <span class="badge badge-warning" data-toggle="tooltip" title="{% t global.contrib %}">contrib <i class="far fa-question-circle"></i></span> - {% t pc_os.arch_descr %} <a href="https://www.parabola.nu/">Parabola</a> {% t pc_os.parabola_descr %}</li>
<li><a href="https://trisquel.info/">Trisquel</a> <span class="badge badge-info">GNU/Linux</span> - {% t pc_os.trisquel_descr %}</li>
<li><a href="https://www.whonix.org/">Whonix</a> <span class="badge badge-info">GNU/Linux</span> <span class="badge badge-warning" data-toggle="tooltip" title="{% t global.contrib %}">contrib <i class="far fa-question-circle"></i></span> - {% t pc_os.whonix_descr %}</li>
</ul>