Skip to content

Commit

Permalink
Merge branch 'master' into glob-10
Browse files Browse the repository at this point in the history
  • Loading branch information
davidmhewitt authored Oct 17, 2023
2 parents 99da212 + ee5baeb commit 8b7e3ef
Show file tree
Hide file tree
Showing 13 changed files with 164 additions and 164 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.

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 & Announcements": "Uutiset & tiedonannot",
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
6 changes: 3 additions & 3 deletions _lang/pl/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": "Przemyślany, sprawny i etyczny zamiennik dla systemów Windows i macOS",
"Generic laptop computer": "Typowy laptop",
"elementary OS 7.1 desktop": "",
"elementary OS 7.1 desktop": "Pulpit elementary OS 7.1",
"Pay What You Can:": "Zapłać tyle ile chcesz:",
"Custom": "Inna kwota",
"Enter any dollar amount.": "Wpisz kwotę w dolarach.",
"Purchase elementary OS": "Kup elementary OS",
"Recommended System Specs": "Rekomendowana konfiguracja sprzętowa",
"FAQ": "Często zadawane pytania",
"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": "Co nowego w 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": "Stworzony z myślą o tobie. OS 7.1 dostarcza nowe opcji personalizacji które sprawiają, że jest on bardziej inkluzywny i dostępny, chroni twoją prywatność i upewnia się, że aplikacje zawsze działają z twojego pozwolenia, oraz odpowiada na Wasze prośby naprawiając 200 błędów, zmieniając wygląd oraz wprowadzając nowe funkcje",
"Read the Announcement": "Przeczytaj ogłoszenie",
"elementary OS AppCenter home page": "Strona domowa AppCenter elementary OS",
"elementary AppCenter icon": "Ikona centrum aplikacji elementary",
Expand Down
4 changes: 2 additions & 2 deletions _lang/pl/press.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"Last Name": "Nazwisko",
"Publication": "Publikacja",
"Subscribe": "Subskrypcja",
"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": "",
"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": "Stworzony z myślą o tobie. OS 7.1 dostarcza nowe opcji personalizacji które sprawiają, że jest on bardziej inkluzywny i dostępny, chroni twoją prywatność i upewnia się, że aplikacje zawsze działają z twojego pozwolenia, oraz odpowiada na Wasze prośby naprawiając 200 błędów, zmieniając wygląd oraz wprowadzając nowe funkcje",
"Read Announcement": "Przeczytaj ogłoszenie",
"Download Press Kit": "Pobierz materiały dla prasy",
"News &amp; Announcements": "Nowości i ogłoszenia",
Expand Down
2 changes: 1 addition & 1 deletion _lang/pl/privacy.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"Sharing Data": "Dzielenie się danymi",
"<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 nie udostępnia żadnych zebranych danych z twoich kont online.</strong> Te dane nigdy nie są wysyłane na serwery elementary, ani żadnym stronom trzecim.",
"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>": "Ta strona korzysta z otwartoźródłowego Plausible Analytics aby anonimowo zliczać wizyty, pobrania itp. Możesz zobaczyć te same dane które ma na <a target=\"_blank\" rel=\"noopener\" href=\"https://plausible.io/elementary.io\">publicznym panelu</a>. Żadne ciasteczka ani dane identyfikujące – włączając w to IP oraz user agent przeglądarki –nie są przechowywane. Więcej informacji znajdziesz w <a class=\"read-more\" target=\"_blank\" rel=\"noopener\" href=\"https://plausible.io/data-policy\">Polityce danych Plausible</a>",
"Cookies": "Ciasteczka",
"<strong>You can choose to disable or selectively turn off any cookies or third-party cookies in your browser settings.</strong>": "<strong>Możesz zdecydować się wyłączyć lub selektywnie zablokować dowolne ciasteczka lub ciasteczka stron trzecich w twoich ustawieniach przeglądarki.</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.": "Ta strona używa ciasteczek dla stopniowych ulepszeń. Możesz spróbować korzystać z niej bez nich, ale spodziewaj się ograniczonej funkcjonalności. Na przykład, strona nie będzie pamiętać czy poprzednio dokonano płatności za elementary OS, więc domyślnie pojawi się pytanie o płatność.",
Expand Down
6 changes: 3 additions & 3 deletions _lang/zh_CN/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": "深虑、全能、有品德的 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": "",
"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": "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 应用中心主页",
"elementary AppCenter icon": "elementary 应用中心图标",
Expand Down
2 changes: 1 addition & 1 deletion _lang/zh_CN/press.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"Publication": "发布内容",
"Subscribe": "订阅",
"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 提供新的个性化选项,让系统更包容、更适合无障碍访问;同时,它也致力于保护您的隐私,并确保应用始终在经过用户明确授权的情况下运行。同时,我们也根据用户反馈,实施了 200 多项问题修复、设计变更和新功能增添",
"Read Announcement": "阅读公告",
"Download Press Kit": "下载宣传资料",
"News &amp; Announcements": "新闻和公告",
Expand Down
Loading

0 comments on commit 8b7e3ef

Please sign in to comment.