Skip to content

Commit beccc81

Browse files
Mayamarmarek
Maya
authored and
marmarek
committed
Rework website files to be translation-friendly
HTML is hard for translators to handle (to not break markup tags). Where easily possible html files to markdown. Otherwise, move translatable strings to separate yaml files (in _data dir), then use layouts and includes to combine them into original html files. In many cases it clarifies separation between data na layout, which is good even without the translation context. This commit adds also language switcher (useless at this stage) and few tags to frontmatter ('lang', 'ref') that will be used in subsequent commits. And additionally, the files that are changed substantially, have whitespaces fixed.
1 parent 9dbc368 commit beccc81

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+3134
-943
lines changed

‎404.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
---
2+
lang: en
23
layout: default
3-
title: 404 Not Found
44
permalink: /404.html
5+
ref: 1
6+
title: 404 Not Found
57
---
68

79
Sorry!

‎_config.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ collections:
3232
permalink: /doc/:path/
3333
hcl:
3434
output: false
35+
qubes-translated:
36+
output: true
37+
3538

3639
allowed_categories:
3740
- press

‎_data/doc.yml‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎_data/download.yml‎

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
- htmlsection: hardware
2+
title: Choosing Your Hardware
3+
links:
4+
- url: /doc/system-requirements/
5+
text: System Requirements
6+
id: 1
7+
- url: /doc/certified-hardware/
8+
text: Certified Hardware
9+
id: 2
10+
- url: /hcl/
11+
text: Hardware Compatibility List
12+
id: 3
13+
14+
- htmlsection: sec
15+
title: Installing Qubes Securely
16+
links:
17+
- url: /doc/installation-guide/
18+
text: Installation Guide
19+
id: 1
20+
- url: /security/verifying-signatures/
21+
text: Verifying Signatures
22+
id: 2
23+
- url: /doc/install-security/
24+
text: Installation Security
25+
id: 3
26+
27+
- htmlsection: help
28+
title: Help and Support
29+
links:
30+
- url: /support/
31+
text: Help and Support
32+
id: 1
33+
- url: /doc/#troubleshooting
34+
text: Troubleshooting Guides
35+
id: 2
36+
- url: /doc/reporting-bugs/
37+
text: Report a Bug
38+
id: 3
39+
40+
- htmlsection: sec-info
41+
title: Security Information
42+
links:
43+
- url: /security/
44+
text: Security Center
45+
id: 1
46+
- url: /security/pack/
47+
text: Security Pack
48+
id: 2
49+
- url: /doc/security-guidelines/
50+
text: Security Guidelines
51+
id: 3
52+
53+
- htmlsection: version-info
54+
title: Version Information
55+
links:
56+
- url: /doc/supported-versions/
57+
text: Supported Versions
58+
id: 1
59+
- url: /doc/templates/
60+
text: Templates
61+
id: 2
62+
- url: /doc/version-scheme/
63+
text: Version Scheme
64+
id: 3
65+
66+
- htmlsection: source-code
67+
title: Source Code
68+
links:
69+
- url: /doc/source-code/
70+
text: Source Code
71+
id: 1
72+
- url: /doc/coding-style/
73+
text: Coding Guidelines
74+
id: 2
75+
- url: /doc/license/
76+
text: Software License
77+
id: 3
78+
79+
- htmlsection: download-mirrors
80+
title: Download Mirrors
81+
table:
82+
- column: Organization
83+
- column: Location
84+
- column: URL
85+
links:
86+
- url: /downloads/mirrors/#instructions-for-mirror-operators
87+
text: How to contribute a download mirror
88+
89+
- htmlsection: donation
90+
title: Qubes OS is made possible by your donations!
91+
paragraph: As a free and open-source software project, we rely on donations from users like you in order to keep running. Your contributions directly support the developers who work hard every day to improve your security. Please consider making a donation today.
92+
url: /donate/
93+
text: Donate
94+
95+
- htmlsection: survey
96+
title: We want to learn from you!
97+
paragraph: The Qubes team is running our first ever survey of new, prospective, and longtime users. Our goal is to ensure Qubes OS meets the needs of the community by gathering responses to common questions about what the community seeks from Qubes OS. Surveys are 100% anonymous (no IP or timestamp information collected) and hosted on a server we own and operate. 5-10 minutes is all it should take.
98+
url: https://survey.qubes-os.org/index.php?r=survey/index&sid=791682&lang=en
99+
text: Begin Survey
100+
101+
- htmlsection: loop-releases
102+
releases:
103+
- r_version: testing
104+
snippets:
105+
- snippet: This is a testing release.
106+
url: /doc/testing/
107+
- snippet: Please help us improve it by reporting any bugs you encounter.
108+
url: /doc/reporting-bugs/
109+
- snippet: For important work, we recommend the latest stable release.
110+
- r_version: stable
111+
snippets:
112+
- snippet: This is the latest stable Qubes OS release. We recommend this release for all new and existing users.
113+
- r_version: old
114+
snippets:
115+
- snippet: This is an old, supported release.
116+
url: /doc/supported-versions/
117+
- snippet: For the best Qubes OS experience, we suggest upgrading to the latest stable release.
118+
- r_version: deprecated
119+
snippets:
120+
- snippet: This is an old, unsupported release.
121+
url: /doc/supported-versions/
122+
- snippet: We strongly recommend upgrading to a supported release in order to receive the latest security updates.
123+
124+
- htmlsection: download-content
125+
links:
126+
- text: Cryptographic hash values
127+
- text: Detached PGP signature
128+
- text: Qubes Release Signing Key
129+
- text: How to Verify Downloads
130+
url: /security/verifying-signatures/
131+
- text: All download mirrors
132+
url: #mirrors
133+
hover: View all download mirrors
134+

‎_data/experts.yml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
- experts:
2+
title: What the experts are saying about Qubes
3+
expert:
4+
- avatar: https://twitter.com/Snowden/status/781493632293605376
5+
img: /attachment/site/expert-edward-snowden.jpg
6+
tweet: https://twitter.com/Snowden/status/781493632293605376
7+
quote: If you're serious about security, Qubes OS is the best OS available today. It's what I use, and free.
8+
name: Edward Snowden
9+
occupation: whistleblower and privacy advocate
10+
- avatar: https://twitter.com/hashbreaker/status/577206817475850240
11+
img: /attachment/site/expert-daniel-j-bernstein.jpg
12+
tweet: https://twitter.com/hashbreaker/status/577206817475850240
13+
quote: "Happy thought of the day: An attacker who merely finds a browser bug can't listen to my microphone except when I've told Qubes to enable it."
14+
name: Daniel J. Bernstein
15+
occupation: mathematician, cryptologist, and computer scientist
16+
- avatar: https://twitter.com/micahflee/status/577998730340622337
17+
img: /attachment/site/expert-micah-lee.jpg
18+
tweet: https://twitter.com/micahflee/status/577998730340622337
19+
quote: When I use Qubes I feel like a god. Software thinks that it's in control, that it can do what it wants? It can't. I'm in control.
20+
name: Micah Lee
21+
occupation: Freedom of the Press Foundation, The Intercept
22+
- avatar: https://twitter.com/csoghoian
23+
img: /attachment/site/expert-christopher-soghoian.jpg
24+
tweet: https://twitter.com/csoghoian
25+
quote: I am so much happier and less stressed out after switching to QubesOS. Can wholeheartedly recommend.
26+
name: Christopher Soghoian
27+
occupation: privacy researcher, activist, and principal technologist at the ACLU
28+
- avatar: https://twitter.com/isislovecruft
29+
img: /attachment/site/expert-isis-agora-lovecruft.jpg
30+
tweet: https://twitter.com/isislovecruft
31+
quote: With QubesOS, I feel more comfortable accessing Tor Project infrastructure from the same laptop I use to execute random GameBoy ROMs I downloaded from the internet.
32+
name: Isis Agora Lovecruft
33+
occupation: cypherpunk and Tor Project core developer
34+
- avatar: https://twitter.com/petertoddbtc/status/924981145871060996
35+
img: /attachment/site/expert-peter-todd.jpg
36+
tweet: https://twitter.com/petertoddbtc/status/924981145871060996
37+
quote: Donated a % of my consulting company's last year revenue to Qubes OS. I rely on it for all my work, and recommend it to clients too.
38+
name: Peter Todd
39+
occupation: Applied Cryptography Consultant
40+
- avatar: https://twitter.com/legind/status/742504400854257664
41+
img: /attachment/site/expert-bill-budington.jpg
42+
tweet: https://twitter.com/legind/status/742504400854257664
43+
quote: I really like it [Qubes OS]. If your hardware supports it, I recommend it. Everything is super well thought-out.
44+
name: Bill Budington
45+
occupation: security engineer and technologist, Electronic Frontier Foundation
46+
- avatar: https://twitter.com/kennwhite/status/914924731400425475
47+
img: /attachment/site/expert-kenn-white.jpg
48+
tweet: https://twitter.com/kennwhite/status/914924731400425475
49+
quote: Periodic shout out to [Rutkowska] and the QubesOS team for *years* of hard work to improve desktop security. Qubes is the real deal.
50+
name: Kenn White
51+
occupation: security researcher, Open Crypto Audit Project
52+
- avatar: https://twitter.com/vitalikbuterin/status/1086465679904038912
53+
img: /attachment/site/expert-vitalik-buterin.jpg
54+
tweet: https://twitter.com/vitalikbuterin/status/1086465679904038912
55+
quote: Trying out Qubes OS (qubes-os.org) recently; linux distro designed around increased security by virtualizing everything and making it really convenient to hop between VMs. Surprisingly good user-friendliness!
56+
name: Vitalik Buterin
57+
occupation: creator of Ethereum
58+

‎_data/hcl.yml‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
- htmlsection: hardware
2+
title: Hardware Type
3+
links:
4+
- url: #hardware-laptops
5+
text: Laptop Devices
6+
id: 1
7+
- url: #hardware-desktops
8+
text: Desktop, Workstation & Servers
9+
id: 2
10+
- url: #hardware-motherboards
11+
text: Motherboards
12+
id: 3
13+
- url: /doc/hcl/#generating-and-submitting-new-reports
14+
text: Add Your Device
15+
id: 4
16+
17+
- htmlsection: info
18+
title: Information
19+
links:
20+
- url: /doc/hcl/
21+
text: What is the Hardware Compatibility List (HCL)?
22+
id: 1
23+
- url: /doc/hcl/#generating-and-submitting-new-reports
24+
text: How do I Submit a Report?
25+
id: 2
26+
- url: /doc/system-requirements/
27+
text: Qubes OS System Requirements
28+
id: 3
29+
- url: /doc/certified-hardware/
30+
text: Certified Hardware
31+
id: 4
32+
- url: /doc/hardware-testing/
33+
text: Hardware Testing
34+
id: 5
35+
36+
- htmlsection: colors
37+
title: Marks & Colours
38+
colors:
39+
- green: feature is working correctly
40+
- blue: a blank cell indicates we lack information
41+
- trump: some tweaking is needed, see remarks for more information
42+
- red: does not work or is not present
43+
44+
- htmlsection: listcol
45+
title: List Columns
46+
47+
- htmlsection: laptop
48+
title: Laptop Devices
49+
50+
- htmlsection: desk
51+
title: Desktop, Workstation & Server
52+
53+
- htmlsection: mother
54+
title: Motherboards

0 commit comments

Comments
 (0)