From 66e1d7f8a32712ce2ffda4b77e0dfbc8157ab3ed Mon Sep 17 00:00:00 2001 From: LWinterberg <87814144+LWinterberg@users.noreply.github.com> Date: Tue, 12 Sep 2023 13:27:53 +0200 Subject: [PATCH 1/5] wording and accessibility fixes --- src/components/homepage/FeatureCards.astro | 8 ++++---- src/components/homepage/ShareYourSounds.astro | 2 +- src/components/navigation/NavigationReact.jsx | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/homepage/FeatureCards.astro b/src/components/homepage/FeatureCards.astro index 8b6acf4..791e12a 100644 --- a/src/components/homepage/FeatureCards.astro +++ b/src/components/homepage/FeatureCards.astro @@ -8,12 +8,12 @@ import FeatureCard from "../card/FeatureCard.jsx"; diff --git a/src/components/homepage/ShareYourSounds.astro b/src/components/homepage/ShareYourSounds.astro index b5b076a..4e5b2dd 100644 --- a/src/components/homepage/ShareYourSounds.astro +++ b/src/components/homepage/ShareYourSounds.astro @@ -6,7 +6,7 @@ import AudioDotComLogo from "../../assets/img/audio-dot-com.svg";
- + audio.com logo

Get free web space for your audio files

diff --git a/src/components/navigation/NavigationReact.jsx b/src/components/navigation/NavigationReact.jsx index 4417d87..fadd703 100644 --- a/src/components/navigation/NavigationReact.jsx +++ b/src/components/navigation/NavigationReact.jsx @@ -46,7 +46,7 @@ function NavigationReact() {

- + Audacity logo Audacity From d88f6f1389d78bca90b89c17ec12adea0d850c2d Mon Sep 17 00:00:00 2001 From: LWinterberg <87814144+LWinterberg@users.noreply.github.com> Date: Tue, 12 Sep 2023 13:36:19 +0200 Subject: [PATCH 2/5] date formatting on blogposts --- src/pages/blog/[slug].astro | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/pages/blog/[slug].astro b/src/pages/blog/[slug].astro index 76bd989..91c188e 100644 --- a/src/pages/blog/[slug].astro +++ b/src/pages/blog/[slug].astro @@ -12,6 +12,12 @@ export async function getStaticPaths() { const { post } = Astro.props; const { Content } = await post.render(); +const options = { + weekday: "long", + year: "numeric", + month: "long", + day: "numeric", +}; --- @@ -19,7 +25,7 @@ const { Content } = await post.render();

{post.data.title}

By {post.data.author}

- {post.data.publishDate} + {post.data.publishDate.toLocaleDateString("en-US", options)}
From 4ae54bcac0e6046aa80b75c9571375afe782218b Mon Sep 17 00:00:00 2001 From: LWinterberg <87814144+LWinterberg@users.noreply.github.com> Date: Tue, 12 Sep 2023 14:52:38 +0200 Subject: [PATCH 3/5] more FAQ things --- astro.config.mjs | 3 ++- src/components/footer/Footer.astro | 3 ++- src/pages/FAQ.md | 32 ++++++++++++++++++++---------- 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/astro.config.mjs b/astro.config.mjs index c79f48e..6db0b48 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -35,6 +35,7 @@ export default defineConfig({ '/devserver': "https://discord.gg/N3XKxzTrq3", "/dev": "https://audacity.gitbook.io/dev/", '/gitbook-access': "https://app.gitbook.com/invite/-MhmG2mhIIHTtQPuHV_k/acNI2LAF6LtdJW06t4Hc", + "/about": "/FAQ#team--news", "/about/desktop-privacy-notice/": "/desktop-privacy-notice/", "/about/license/": "https://github.com/audacity/audacity/blob/master/LICENSE.txt", "/about/citations-screenshots-and-permissions/": "https://github.com/audacity/audacity/blob/master/LICENSE.txt", @@ -54,7 +55,7 @@ export default defineConfig({ "/download/online-safety-when-downloading/": "/FAQ#is-audacity-safe-to-download", "/download/source/": "/download", "/help/": "https://support.audacityteam.org/", - "/contact/": "https://forum.audacityteam.org/", + "/contact/": "/FAQ#i-have-a-question-or-issue-with-audacity-is-there-a-support-team-i-can-contact", "/community/": "https://support.audacityteam.org/community/contributing", "/community/users/": "https://support.audacityteam.org/community/contributing", "/community/developers/": "https://audacity.gitbook.io/dev", diff --git a/src/components/footer/Footer.astro b/src/components/footer/Footer.astro index b1d8f2e..adb9b57 100644 --- a/src/components/footer/Footer.astro +++ b/src/components/footer/Footer.astro @@ -17,6 +17,7 @@ import "../../styles/fonts.css" >

Links
diff --git a/src/pages/FAQ.md b/src/pages/FAQ.md index 8582318..a4f1f04 100644 --- a/src/pages/FAQ.md +++ b/src/pages/FAQ.md @@ -21,7 +21,7 @@ Here are a few of the most common ways Audacity is used every day: - Field recorders and educators, who can capture, edit or analyze the sounds of environments, ambience, animals and more. #### Is Audacity open source? -Audacity is proudly open source. This means its source code remains open to anyone to view or modify. +Audacity is proudly open source. This means its source code remains open to anyone to view or modify. Audacity is licensed under the GNU General Public License. Details can be found [here](https://github.com/audacity/audacity/blob/master/LICENSE.txt). A dedicated worldwide community of passionate audio lovers have collaborated to make Audacity the well-loved software it is today. Many third-party plug-ins have also been developed for Audacity thanks to its open source nature. @@ -133,16 +133,14 @@ Try the free, online [Audacity manual](https://manual.audacityteam.org/) for in- #### What is Audacity's privacy policy? The Audacity app only collects data relevant to error reporting (such as device information) and software updates. -The Audacity team will take all the necessary steps to keep your data protected. It is fully GDPR compliant in EU regions. +The Audacity team will take all the necessary steps to keep your data protected. It is fully GDPR compliant. Read Audacity's privacy policy in full [here](/desktop-privacy-policy/). The cookie policy for this website can be found [here](/cookie-policy/). #### Is Audacity spyware? -No. Audacity is entirely safe to use and only collects data relevant to error reporting (such as device information) and software updates. +No. Audacity is entirely safe to use and doesn't store personal information. Audacity only collects data relevant to error reporting (such as device information) and software updates. -After Audacity 3.0.3 was released, we have since reviewed our privacy policy and will take all the necessary steps to keep your data protected. The Audacity team is fully GDPR compliant in EU regions. - -Read Audacity's privacy policy in full [here](https://www.audacityteam.org/desktop-privacy-policy/). +The Audacity team is fully GDPR compliant. Read Audacity's privacy policy in full [here](/desktop-privacy-policy/). #### I've shared my Audacity project on Audio.com. What are my legal rights regarding my project? If you are the sole creator of the audio project, the intellectual property rights and mechanical copyright is retained by you. Similar to other UGC (User Generated Content) platforms, by using [audio.com](https://audio.com/) you grant a license to host and show your work. You are also free to distribute your work on other platforms, if you wish. For more details read the full [Terms & Conditions](https://audio.com/legal/terms-of-use.pdf). @@ -151,8 +149,22 @@ If you are the sole creator of the audio project, the intellectual property righ ## Team & news +#### Who is the Audacity Team? +Audacity is developed by a small team working remotely and supported by the community. + +Current team members are: + +* Product owner: Martin Keary +* Project manager: Yana Larina +* Developers: Matthieu Hodgkinson, Paul Licameli, K. Soze, Vitaly Sverchinsky, Dmitry Vedenko +* Designers: Dilson's Pickles, Leo Wattenberg +* Testers: Sergey Lapysh +* Borrowed from other muse projects: Peter Jonas, Anita Sudan, Jessica Williamson + +Code contributors can be found on Github in the [commit history](https://github.com/audacity/audacity/commits/master) and [graphs](https://github.com/audacity/audacity/graphs/contributors), [contributors to the manual](https://manual.audacityteam.org/man/credits.html), [contributors to the forum](https://forum.audacityteam.org/u?order=post_count&period=all) and [contributors to the support site](https://support.audacityteam.org/community/contributing/credits-and-license) can be found on the respective pages. + #### Where can I stay up to date with the latest Audacity news and updates? -Subscribe to Audacity [YouTube Channel](https://www.youtube.com/@audacity), or follow us on [Facebook](https://www.facebook.com/Audacity/) or [Twitter](https://twitter.com/getaudacity). +Check out our [blog](/blog), subscribe to Audacity [YouTube Channel](https://www.youtube.com/@audacity), or follow us on [Facebook](https://www.facebook.com/Audacity/) or [Twitter](https://twitter.com/getaudacity). #### I have a question or issue with Audacity. Is there a support team I can contact? Many frequently asked questions and issues are answered on our support page [here](https://support.audacityteam.org/). For detailed information on Audacity features, please check out the [Audacity manual](https://manual.audacityteam.org/index.html). @@ -160,11 +172,11 @@ Many frequently asked questions and issues are answered on our support page [her If you have a question you can't find the answer to, please leave a comment on the [Audacity forum](https://forum.audacityteam.org/), where one of our team (or someone in the Audacity community), will be happy to help! #### I'm an open-source developer working with Audacity. How can I get in touch with the team? -Audacity is currently undergoing major restructuring, so we unfortunately have very limited capacity to support third parties. That said, feel free to drop by our [dev discord](/devserver). +Audacity is currently undergoing major code restructuring, so we unfortunately have very limited capacity to support third parties. That said, feel free to drop by our [dev discord](/devserver). #### What is the history of Audacity? -Audacity has transformed the lives of musicians and audio content creators for over two decades. Since launching in 2000, the desktop app has been downloaded over 100 million times. +Audacity has transformed the lives of musicians and audio content creators for over two decades. Since launching in 2000, the desktop app has been downloaded over 200 million times. -In 2020, we joined with the makers of Ultimate Guitar, MuseScore and others to form Muse Group, with a mission to empower millions of creatives all over the globe. +In 2020, we joined with the makers of [Ultimate Guitar](https://www.ultimate-guitar.com/), [MuseScore](https://musescore.org/) and others to form [Muse Group](https://mu.se/), with a mission to empower millions of creatives all over the globe. Since then, our sister service [audio.com](https://audio.com) launched. We remain committed to our free, open-source roots — and passionate about helping the next generation create the very best sounds, music and podcasts with Audacity. \ No newline at end of file From f72479ae66cb45808e9f6ad7fafb30f60c6e2d5e Mon Sep 17 00:00:00 2001 From: LWinterberg <87814144+LWinterberg@users.noreply.github.com> Date: Tue, 12 Sep 2023 15:02:48 +0200 Subject: [PATCH 4/5] add CLA --- src/pages/CLA.md | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 src/pages/CLA.md diff --git a/src/pages/CLA.md b/src/pages/CLA.md new file mode 100644 index 0000000..de47ed2 --- /dev/null +++ b/src/pages/CLA.md @@ -0,0 +1,41 @@ +--- +layout: "../layouts/PageLayout.astro" +title: Audacity | Contributor License Agreement +--- +# Contributor License Agreement + +Thank you for your interest in contributing to Audacity. This page describes the established guidelines for contributions of code, patches and artwork to Audacity. + +In order to clarify the intellectual property license granted with contributions from any person or entity, Audacity must have a Contributor License Agreement (CLA) on file that has been signed by each Contributor, indicating agreement to certain license terms. This license is not only for the protection of the contributors themselves, but also for the protection of the project and its users; it does not change your rights to use your own Contributions for any other purpose. + +All past and future contributors of non-trivial amounts of code (more than just a line or two) to Audacity are required to sign the CLA. If somebody is unable to sign the document, their contribution will not be accepted or will be removed from Audacity. + +Version 1.0 – May 1, 2020 + +## Questions +### What is a CLA? + +A Contributor License Agreement (CLA) defines the terms under which intellectual property has been contributed to a company/project, typically open source. Quote from Wikipedia. + +### Why is a signed CLA required? + +The license agreement is a legal document in which you state you are entitled to contribute the code to Audacity and are willing to have it used in distributions and derivative works. This means that should there be any kind of legal issue in the future as to the origins and ownership of any particular piece of code, Audacity has the necessary forms on file from the contributor(s) saying they were permitted to make this contribution. + +The CLA also ensures that once you have provided a contribution, you cannot try to withdraw permission for its use at a later date. People and companies can therefore use Audacity, confident that they will not be asked to stop using pieces of the code at a later date. + +Being able to make a clear statement about the origins of the code is very important as Audacity is adopted by large organizations who are necessarily cautious about adopting products with unknown origins. We wish for Audacity to be used and distributed as widely as possible and in order to do this with confidence, we need to be sure about the origins and continuing existence of the code. + +### Can I withdraw permission to use my contributions at a later date? + +No. This is one of the reasons Audacity requires a CLA. No individual contributor can hold such a threat over the entire community of users. Once you make a contribution, you are saying MUSECY SM LTD (an affiliate of MuseScore and Ultimate Guitar) can use that piece of code forever. + +Trivial patches like spelling fixes or missing words won’t require an agreement, since anybody could do those. However, almost anything will require a CLA. + +## You and Audacity agree: +* You grant MUSECY SM LTD, an affiliate of MuseScore and Ultimate Guitar, (“Company”) the ability to use the Contributions in any way. You hereby grant to Company , a perpetual, non-exclusive, worldwide, fully paid-up, royalty free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute your Contribution and such derivative works. +* You are able to grant Company these rights. You represent that You are legally entitled to grant the above license. If Your employer has rights to intellectual property that You create, You represent that You have received permission to make the Contributions on behalf of that employer, or that Your employer has waived such rights for the Contributions. +* The Contributions are your original work. You represent that the Contributions are Your original works of authorship, and to Your knowledge, no other person claims, or has the right to claim, any right in any invention or patent related to the Contributions. You also represent that You are not legally obligated, whether by entering into an agreement or otherwise, in any way that conflicts with the terms of this license. For example, if you have signed an agreement requiring you to assign the intellectual property rights in the Contributions to an employer or customer, that would conflict with the terms of this license. +* Company determines the code that is in the Company project. You understand that the decision to include the Contribution in any project or source repository is entirely that of Company, and this agreement does not guarantee that the Contributions will be included in any product. +* No Implied Warranties. Company acknowledges that, except as explicitly described in this Agreement, the Contribution is provided on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. + + \ No newline at end of file From acd2d742cf17292ec3b3cd42eca988b6301ef610 Mon Sep 17 00:00:00 2001 From: LWinterberg <87814144+LWinterberg@users.noreply.github.com> Date: Tue, 12 Sep 2023 15:07:54 +0200 Subject: [PATCH 5/5] redirect installation exit codes --- astro.config.mjs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/astro.config.mjs b/astro.config.mjs index 6db0b48..799baf9 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -60,6 +60,7 @@ export default defineConfig({ "/community/users/": "https://support.audacityteam.org/community/contributing", "/community/developers/": "https://audacity.gitbook.io/dev", "/community/translators/": "https://support.audacityteam.org/community/contributing/translating", - "/copyright/": "https://github.com/audacity/audacity/blob/master/LICENSE.txt" + "/copyright/": "https://github.com/audacity/audacity/blob/master/LICENSE.txt", + "/Setup-Exit-Codes/": "https://support.audacityteam.org/troubleshooting/error-codes/installation-exit-codes" } });