Skip to content

Commit

Permalink
Merge branch 'master' into fix-header-menu-align
Browse files Browse the repository at this point in the history
  • Loading branch information
lewisgoddard authored Oct 22, 2023
2 parents 744061c + 207acd1 commit 930b90f
Show file tree
Hide file tree
Showing 23 changed files with 633 additions and 399 deletions.
2 changes: 1 addition & 1 deletion _backend/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
}
},
"require": {
"stripe/stripe-php": "12.5.0",
"stripe/stripe-php": "12.7.0",
"sentry/sdk": "^3.3.0",
"erusev/parsedown-extra": "^0.8",
"geoip2/geoip2": "^2.0",
Expand Down
15 changes: 7 additions & 8 deletions _backend/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion _lang/ca/privacy.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"Sharing Data": "Compartició de dades",
"<strong>elementary OS does not share any data collected from your online accounts.</strong> The data is never sent to elementary or third-party servers.": "<strong>L'elementary OS no comparteix dades recollides dels comptes en línia.</strong> Les dades no s’envien mai a servidors d'elementary ni de tercers.",
"elementary.io": "elementary.io",
"This website uses the open source Plausible Analytics to anonymously count visits, downloads, etc. You can see the same data we can see on <a target=\"_blank\" rel=\"noopener\" href=\"https://plausible.io/elementary.io\">the public dashboard</a>. No cookies are used and no personal data—not even an IP address or browser user agent—is stored. For more information, see the <a class=\"read-more\" target=\"_blank\" rel=\"noopener\" href=\"https://plausible.io/data-policy\">Plausible Data Policy</a>": "",
"This website uses the open source Plausible Analytics to anonymously count visits, downloads, etc. You can see the same data we can see on <a target=\"_blank\" rel=\"noopener\" href=\"https://plausible.io/elementary.io\">the public dashboard</a>. No cookies are used and no personal data—not even an IP address or browser user agent—is stored. For more information, see the <a class=\"read-more\" target=\"_blank\" rel=\"noopener\" href=\"https://plausible.io/data-policy\">Plausible Data Policy</a>": "Aquest lloc web usa Plausible Analytics de codi obert per comptar de manera anònima visites, descàrregues, etc. Podeu veure les mateixes dades que podem veure nosaltres a <a target=\"_blank\" rel=\"noopener\" href=\"https://plausible.io/ elementary.io\">el tauler públic</a>. No s'usen galetes i no s'emmagatzemen dades personals, ni tan sols una adreça IP o un agent d'usuari del navegador. Per obtenir-ne més informació, consulteu la <a class=\"read-more\" target=\"_blank\" rel=\"noopener\" href=\"https://plausible.io/data-policy\">Política de dades plausibles</a>",
"Cookies": "Galetes",
"<strong>You can choose to disable or selectively turn off any cookies or third-party cookies in your browser settings.</strong>": "<strong>Podeu desactivar o desactivar selectivament qualssevol galetes o galetes de tercers a la configuració del navegador.</strong>",
"This site uses cookies for incremental improvements. You may find the services function without them but at a reduced usability. For example, the site will not remember if you have previously paid for elementary OS; by default you will be asked to pay again.": "Aquest lloc utilitza galetes per a millores incrementals. Podeu trobar que els serveis funcionen sense, però amb una usabilitat reduïda. Per exemple, el lloc no recordarà si heu pagat prèviament el sistema operatiu elementary i, per defecte, se us demanarà que torneu a pagar.",
Expand Down
6 changes: 3 additions & 3 deletions _lang/fi/index.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"The thoughtful, capable, and ethical replacement for Windows and macOS": "Huomaavainen, kykenevä ja eettinen korvike Windowsille ja macOS:lle",
"Generic laptop computer": "Tavallinen kannettava tietokone",
"elementary OS 7.1 desktop": "",
"elementary OS 7.1 desktop": "elementary OS 7.1 -työpöytä",
"Pay What You Can:": "Maksa mitä haluat:",
"Custom": "Muu",
"Enter any dollar amount.": "Syötä haluamasi summa.",
"Purchase elementary OS": "Osta elementary OS",
"Recommended System Specs": "Suositellut järjestelmävaatimukset",
"FAQ": "UKK",
"What’s New in elementary OS 7.1": "",
"Made with care with you in mind. OS 7.1 provides new personalization options that make it more inclusive and accessible, protects your privacy and ensures apps always operate with your explicit consent, and addresses your feedback with over 200 bug fixes, design changes, and new features": "",
"What’s New in elementary OS 7.1": "Mitä uutta elementary OS 7.1 sisältää",
"Made with care with you in mind. OS 7.1 provides new personalization options that make it more inclusive and accessible, protects your privacy and ensures apps always operate with your explicit consent, and addresses your feedback with over 200 bug fixes, design changes, and new features": "OS 7.1 tarjoaa uusia mukauttamismahdollisuuksia, jotka tekevät siitä aiempaa kattavamman ja saavutettavamman, yksityisyyttä enemmän suojaavamman ja varmistaa, että sovellukset toimivat aina luvallasi. Se vastaa saatuun palautteeseen yli 200 korjauksella, suunnittelumuutoksella ja uudella ominaisuudella",
"Read the Announcement": "Lue tiedote",
"elementary OS AppCenter home page": "elementary OS:n Sovelluskeskuksen kotisivu",
"elementary AppCenter icon": "elementaryn sovelluskeskuksen kuvake",
Expand Down
2 changes: 1 addition & 1 deletion _lang/fi/press.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"Publication": "Julkaisu",
"Subscribe": "Tilaa",
"elementary OS 7.1": "",
"Made with care with you in mind. OS 7.1 provides new personalization options that make it more inclusive and accessible, protects your privacy and ensures apps always operate with your explicit consent, and addresses your feedback with over 200 bug fixes, design changes, and new features": "",
"Made with care with you in mind. OS 7.1 provides new personalization options that make it more inclusive and accessible, protects your privacy and ensures apps always operate with your explicit consent, and addresses your feedback with over 200 bug fixes, design changes, and new features": "OS 7.1 tarjoaa uusia mukauttamismahdollisuuksia, jotka tekevät siitä aiempaa kattavamman ja saavutettavamman, yksityisyyttä enemmän suojaavamman ja varmistaa, että sovellukset toimivat aina luvallasi. Se vastaa saatuun palautteeseen yli 200 korjauksella, suunnittelumuutoksella ja uudella ominaisuudella",
"Read Announcement": "Lue julkaisutiedote",
"Download Press Kit": "Lataa lehdistöpaketti",
"News &amp; Announcements": "Uutiset &amp; tiedonannot",
Expand Down
2 changes: 1 addition & 1 deletion _lang/fr/privacy.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"Sharing Data": "Partage des données",
"<strong>elementary OS does not share any data collected from your online accounts.</strong> The data is never sent to elementary or third-party servers.": "<strong>elementary OS ne partage aucune des données collectées à partir de vos comptes en ligne.</strong> Les données ne sont jamais envoyées à elementary ou à des serveurs tiers.",
"elementary.io": "elementary.io",
"This website uses the open source Plausible Analytics to anonymously count visits, downloads, etc. You can see the same data we can see on <a target=\"_blank\" rel=\"noopener\" href=\"https://plausible.io/elementary.io\">the public dashboard</a>. No cookies are used and no personal data—not even an IP address or browser user agent—is stored. For more information, see the <a class=\"read-more\" target=\"_blank\" rel=\"noopener\" href=\"https://plausible.io/data-policy\">Plausible Data Policy</a>": "",
"This website uses the open source Plausible Analytics to anonymously count visits, downloads, etc. You can see the same data we can see on <a target=\"_blank\" rel=\"noopener\" href=\"https://plausible.io/elementary.io\">the public dashboard</a>. No cookies are used and no personal data—not even an IP address or browser user agent—is stored. For more information, see the <a class=\"read-more\" target=\"_blank\" rel=\"noopener\" href=\"https://plausible.io/data-policy\">Plausible Data Policy</a>": "Ce site utilise la solution libre Plausible Analytics pour comptabiliser de manière anonyme les visites, les téléchargements, etc. Vous pouvez consulter les mêmes données que nous sur <a target=\"_blank\" rel=\"noopener\" href=\"https://plausible.io/elementary.io\">le tableau de bord public</a>. Aucun cookie n'est utilisé et aucune donnée personnelle, pas même une adresse IP ou un agent utilisateur du navigateur, n'est conservée. Pour plus d'informations, veuillez consulter la <a class=\"read-more\" target=\"_blank\" rel=\"noopener\" href=\"https://plausible.io/data-policy\" >Politique de confidentialité des données de Plausible</a>",
"Cookies": "Cookies",
"<strong>You can choose to disable or selectively turn off any cookies or third-party cookies in your browser settings.</strong>": "<strong>Vous pouvez choisir de désactiver ou de désactiver sélectivement les cookies ou les cookies tiers dans les paramètres de votre navigateur.</strong>",
"This site uses cookies for incremental improvements. You may find the services function without them but at a reduced usability. For example, the site will not remember if you have previously paid for elementary OS; by default you will be asked to pay again.": "Ce site utilise des cookies pour des améliorations additionnelles. Vous pouvez trouver la fonction des services sans eux mais avec une facilité d'utilisation réduite. Par exemple, le site ne se souviendra pas si vous avez déjà payé pour elementary OS ; par défaut, il vous sera demandé de payer à nouveau.",
Expand Down
4 changes: 2 additions & 2 deletions _lang/he/index.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"The thoughtful, capable, and ethical replacement for Windows and macOS": "החלופה המתחשבת, המותאמת והאתית ל־Windows ול־macOS",
"Generic laptop computer": "מחשב נייד רגיל",
"elementary OS 7.1 desktop": "",
"elementary OS 7.1 desktop": "שולחן העבודה elementary OS 7.1",
"Pay What You Can:": "תשלום כראות עיניך:",
"Custom": "התאמה אישית",
"Enter any dollar amount.": "להזין סכום כלשהו בדולרים.",
"Purchase elementary OS": "רכישת elementary OS",
"Recommended System Specs": "מפרט המערכת המומלץ",
"FAQ": "שו״ת",
"What’s New in elementary OS 7.1": "",
"What’s New in elementary OS 7.1": "מה חדש ב־elementary OS 7.1",
"Made with care with you in mind. OS 7.1 provides new personalization options that make it more inclusive and accessible, protects your privacy and ensures apps always operate with your explicit consent, and addresses your feedback with over 200 bug fixes, design changes, and new features": "נבנתה בתשומת לב רבה לצרכים שלך. OS 7.1 מספקת אפשרויות התאמה אישית שהופכות אותה למותאמת ונגישה לקהל רחב יותר, מגינה על הפרטיות שלך ומוודאת שהיישומים פועלים באופן המוסכם עליך עונה על משוב המשתמשים עם למעלה מ־200 תיקוני תקלות, שינויים עיצוביים ויכולות חדשות",
"Read the Announcement": "לקריאת ההכרזה",
"elementary OS AppCenter home page": "דף הבית של מרכז היישומים של elementary OS",
Expand Down
2 changes: 1 addition & 1 deletion _lang/he/privacy.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"Sharing Data": "שיתוף נתונים",
"<strong>elementary OS does not share any data collected from your online accounts.</strong> The data is never sent to elementary or third-party servers.": "<strong>elementary OS אינה משתפת נתונים שנאספו מהחשבונות המקוונים שלך.</strong> הנתונים אף פעם אינם נשלחים ל־elementary או לשרתי צד־שלישי.",
"elementary.io": "elementary.io",
"This website uses the open source Plausible Analytics to anonymously count visits, downloads, etc. You can see the same data we can see on <a target=\"_blank\" rel=\"noopener\" href=\"https://plausible.io/elementary.io\">the public dashboard</a>. No cookies are used and no personal data—not even an IP address or browser user agent—is stored. For more information, see the <a class=\"read-more\" target=\"_blank\" rel=\"noopener\" href=\"https://plausible.io/data-policy\">Plausible Data Policy</a>": "",
"This website uses the open source Plausible Analytics to anonymously count visits, downloads, etc. You can see the same data we can see on <a target=\"_blank\" rel=\"noopener\" href=\"https://plausible.io/elementary.io\">the public dashboard</a>. No cookies are used and no personal data—not even an IP address or browser user agent—is stored. For more information, see the <a class=\"read-more\" target=\"_blank\" rel=\"noopener\" href=\"https://plausible.io/data-policy\">Plausible Data Policy</a>": "אתר זה משתמש ב־Plausible Analytics שבקוד פתוח כדי לספור ביקורים, הורדות ועוד בצורה אלמונית. אפשר לצפות באותם הנתונים ב<a target=\"_blank\" rel=\"noopener\" href=\"https://plausible.io/elementary.io\">לוח הבקרה הציבורי</a>. לא נעשה שימוש בעוגיות ולא נאספים נתונים אישיים, אפילו לא כתובת IP או סוכן המשתמש של הדפדפן. למידע נוסף, יש לעיין ב<a class=\"read-more\" target=\"_blank\" rel=\"noopener\" href=\"https://plausible.io/data-policy\">מדיניות המידע של Plausible</a>",
"Cookies": "עוגיות",
"<strong>You can choose to disable or selectively turn off any cookies or third-party cookies in your browser settings.</strong>": "<strong>לבחירתך, ניתן להשבית באופן נקודתי כל עוגייה פנימית או ממקור צד שלילי בעזרת הגדרות הדפדפן שלך.</strong>",
"This site uses cookies for incremental improvements. You may find the services function without them but at a reduced usability. For example, the site will not remember if you have previously paid for elementary OS; by default you will be asked to pay again.": "אתר זה משתמש בעוגיות לטובת שיפור הדרגתי. יתכן שהשירותים יפעלו בלעדיהן אך עם שימושיות לקויה. לדוגמה, האתר הזה לא יזכור אם שילמת בעבר על elementary OS, כבררת מחדל תופיע בקשה לשלם פעם נוספת.",
Expand Down
2 changes: 1 addition & 1 deletion _lang/ja/get-involved.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"Our design team turns ideas into clear issue reports and deliverable assets. Before diving in, it's recommended to read about our design workflow.": "私たちのデザインチームは、アイデアをイシューレポートに明確化し、サンプルを作成します。作業にとりかかる前に、私たちのデザインのワークフローについて読むことを推奨します。",
"Our design team tracks “Needs Design” issues in GitHub. These might need further design discussion, wireframes, or deliverable assets.": "私たちのデザインチームは、GitHub で “Needs Design” とラベル付けされた不具合を追跡しています。これらには、さらなる議論やワイヤーフレーム、サンプルが必要なことがあります。",
"See ‘Needs Design’ Issues": "‘Needs Design’ タグの付いた Issue を参照",
"elementary OS uses a system stylesheet written in CSS. It defines how the interface—like buttons, toolbars, and menus—is displayed.": "lementary OS では、CSS で記述されたシステムスタイルシートを使用しています。これは、ボタンやツールバー、メニューなどの UI の見た目を定義しています。",
"elementary OS uses a system stylesheet written in CSS. It defines how the interface—like buttons, toolbars, and menus—is displayed.": "elementary OS では、CSS で記述されたシステムスタイルシートを使用しています。これは、ボタンやツールバー、メニューなどの UI の見た目を定義しています。",
"View Stylesheet": "スタイルシートを参照",
"elementary OS comes with a set of vector icons that are used across all default apps and are made available to third-party apps.": "elementary OS には、全プリインストールアプリで使われており、サードパーティーアプリでも利用可能な、ベクターアイコンのセットが付属しています。",
"Browse Icons": "アイコンを参照",
Expand Down
2 changes: 1 addition & 1 deletion _lang/ja/oem.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"Partner": "パートナー",
"Per-model approval, with each model featured in <a href=\"https://store.elementary.io\">our store</a>.": "1機種ごとに承認され、<a href=\"https://store.elementary.io\">ストア</a>に掲載されます。",
"Requirements:": "要件:",
"Official involvement from elementary, Inc.": "elementary, Inc. からの公式な関与",
"Official involvement from elementary, Inc.": "elementary, Inc. からの公式な協力",
"Negotiable per-device royalty": "デバイスごとに交渉可能な使用料",
"Strict software guidelines": "厳格なソフトウェアガイドライン",
"Trademark compliance": "商標のコンプライアンス",
Expand Down
Loading

0 comments on commit 930b90f

Please sign in to comment.