Commit 166594bf authored by Eliot Berriot's avatar Eliot Berriot 💬

Merge branch 'patch-1' into 'master'

Language reworked and markup fixed

See merge request !7
parents d690bd02 ac07e26a
Pipeline #2941 passed with stages
in 1 minute and 17 seconds
......@@ -5,12 +5,12 @@ export function getTasks (v) {
duration: 5,
icon: "eur",
slug: 'become-backer',
summary: v.$pgettext("Task summary", "Support Funkwhale financially, on a one-time or recurring basis.",),
summary: v.$pgettext("Task summary", 'Support Funkwhale financially, on a one-time or recurring basis.'),
skills: [],
steps: [
{
title: v.$pgettext("Guide step title", 'Decide how much you want to give'),
content: [v.$pgettext("Guide step content", "We accept both one-time and recurring donations, starting at 1€. If you don't know what to choose, we have a preference for receiving smaller but recurring donations over bigger but one time payments."),],
content: [v.$pgettext("Guide step content", "Both one-time and recurring donations are accepted with joy, starting at 1€. Smaller but recurring donations provide more smiles than big one time payments."),],
media: [
{
type: 'image',
......@@ -41,8 +41,8 @@ export function getTasks (v) {
]
},
{
title: v.$pgettext("Guide step title", 'Visit the collective page'),
content: [v.$pgettext("Guide step content", "Head over the Open Collective page to get a list of backing options and pick the one you prefer."),],
title: v.$pgettext("Guide step title", 'Visit the Open Collective page'),
content: [v.$pgettext("Guide step content", "Pick the one you prefer from a list of backing options."),],
links: [
{
text: v.$pgettext("Text for link in guide step", 'Funkwhale page on Open Collective'),
......@@ -51,8 +51,8 @@ export function getTasks (v) {
]
},
{
title: v.$pgettext("Guide step title", 'Proceed to the payment'),
content: [v.$pgettext("Guide step content", "Enter your payment details and submit the form."),],
title: v.$pgettext("Guide step title", 'Proceed to payment'),
content: [v.$pgettext("Guide step content", "Enter your payment details and send the payment."),],
}
]
},
......@@ -60,20 +60,20 @@ export function getTasks (v) {
name: v.$pgettext("Task name", "Talk about Funkwhale"),
duration: 5,
icon: "share",
summary: v.$pgettext("Task summary", "Increase the awareness of Funkwhale within your circle."),
summary: v.$pgettext("Task summary", "Increase the awareness of Funkwhale within audible range of your megaphone."),
slug: 'talk-about-funkwhale',
steps: [
{
title: v.$pgettext("Guide step title", 'Choose your audience'),
content: [
v.$pgettext("Guide step content", "Who could be interested by Funkwhale within your circle? Funkwhale may be interesting for musicians, music or podcasts lovers, free/federated software fans..."),
v.$pgettext("Guide step content", "Who could be interested by Funkwhale within your circle? Funkwhale may be interesting for musicians, music or podcasts lovers, free/federated software fans"),
],
recommendations: [
v.$pgettext("Advice content / recommendations", "Pick someone, or a group of people, who is likely to be excited about Funkwhale"),
v.$pgettext("Advice content / recommendations", "Address people or communities you are familiar with"),
v.$pgettext("Advice content / recommendations", "Pick someone, or a group of people likely to be excited about Funkwhale."),
v.$pgettext("Advice content / recommendations", "Address people or communities that run with you."),
],
avoid: [
v.$pgettext("Advice content / avoid", "Spamming people, it will likely hurt the project"),
v.$pgettext("Advice content / avoid", "Other people, nobody likes other people, it will likely hurt the project. Stranger danger."),
]
},
{
......@@ -82,7 +82,7 @@ export function getTasks (v) {
v.$pgettext("Guide step content", "Choose a medium your audience is comfortable with. Typical media include: SMS, forums, social media, private messaging systems, oral discussion, etc."),
],
recommendations: [
v.$pgettext("Advice content / recommendations", "Use a medium you are familiar with"),
v.$pgettext("Advice content / recommendations", "Use a medium you are familiar with."),
],
},
{
......@@ -133,20 +133,20 @@ export function getTasks (v) {
}
],
avoid: [
v.$pgettext("Advice content / avoid", "Publishing your feedback on other platforms, it's likely to be missed"),
v.$pgettext("Advice content / avoid", "Publishing your feedback on other platforms is not going to go well, it's likely to be missed"),
]
},
{
title: v.$pgettext("Guide step title", 'Write your message'),
content: [
v.$pgettext("Guide step content", "Tell us how you felt using Funkwhale. What did you like or dislike? What would you like to see improved?"),
v.$pgettext("Guide step content", "Remember that people receiving your feedback are humans, just like you. While we welcome both positive and negative feedback, we won't tolerate personnal attacks or rude or harmful language."),
v.$pgettext("Guide step content", "Remember, the job of receiving feedback is one we run on humans, just like you. We assume a mix of positive and negative feedback, no personal attacks or rude language."),
],
recommendations: [
v.$pgettext("Advice content / recommendations", "Be specific: precise feedback is the most helpful"),
v.$pgettext("Advice content / recommendations", "Be specific: Precise feedback is the most helpful"),
],
avoid: [
v.$pgettext("Advice content / avoid", "Using rude, harmful or aggressive language"),
v.$pgettext("Advice content / avoid", "Use of rude, or aggressive language"),
]
},
]
......@@ -156,11 +156,11 @@ export function getTasks (v) {
duration: 15,
slug: "join-discussion",
icon: "comment",
summary: v.$pgettext("Task summary", "Help us shape the future of Funkwhale and go in the right direction.",),
summary: v.$pgettext("Task summary", 'Help the Funkwhale whale go in the right direction.'),
steps: [
{
title: v.$pgettext("Guide step title", 'Create your Discourse account'),
content: [v.$pgettext("Guide step content", 'Project discussion happens on our Discourse instance, at SocialHub.network, Discourse being a forum software. You can browse the content without an account, but you\'ll need one if you want to engage.'),],
content: [v.$pgettext("Guide step content", 'Project discussions take place at SocialHub.network, which uses Discourse. Browse without an account, and get one to stop people from being wrong on the Internet.'),],
links: [
{
icon: 'comment',
......@@ -170,11 +170,11 @@ export function getTasks (v) {
]
},
{
title: v.$pgettext("Guide step title", 'Visit the Funkwhale duration'),
content: [v.$pgettext("Guide step content", 'Since we share the forum with other projects, you should visit our dedicated section of the forum.'),],
title: v.$pgettext("Guide step title", 'Visit the Funkwhale section'),
content: [v.$pgettext("Guide step content", 'Since we share the forum with other projects, visit the /c/funkwhale part the forum.'),],
links: [
{
text: v.$pgettext("Text for link in guide step", 'Go to the "Funkwhale" duration'),
text: v.$pgettext("Text for link in guide step", 'Go to the "Funkwhale" section'),
url: 'https://socialhub.network/c/funkwhale',
}
],
......@@ -182,18 +182,18 @@ export function getTasks (v) {
{
type: 'image',
url: '/assets/guides/join-discussion/top-categories-widget.png',
caption: v.$pgettext("Task image caption", 'There is a list of top-level categories on the homepage')
caption: v.$pgettext("Task image caption", 'A list of top-level categories is to be found on the homepage')
},
{
type: 'image',
url: '/assets/guides/join-discussion/menu-categories.png',
caption: v.$pgettext("Task image caption", 'You can also navigate between the categories using the corresponing menu')
caption: v.$pgettext("Task image caption", 'Navigation between the categories using the corresponding menu is also possible')
},
]
},
{
title: v.$pgettext("Guide step title", 'Read the forum guidelines'),
content: [v.$pgettext("Guide step content", 'We have a few rules you should respect on the forum, and also some recommendations on how to use this space. Take some time to read them.'),],
content: [v.$pgettext("Guide step content", 'We know you don\'t read forum guidelines. Ours are not the reason you don\'t.'),],
links: [
{
text: v.$pgettext("Text for link in guide step", 'Read the forum guidelines'),
......@@ -202,11 +202,11 @@ export function getTasks (v) {
],
},
{
title: v.$pgettext("Guide step title", 'Get involved in discussion'),
content: [v.$pgettext("Guide step content", 'You can now browse the forum and find interesting topics. Add your input in discussions and debate, answer other people\'s question. We also invite you to introduce yourself in a dedicated post, to get in touch with the rest of the community :)'),],
title: v.$pgettext("Guide step title", 'Discuss'),
content: [v.$pgettext("Guide step content", 'Browse the forum for topics of interest. Lurk, or add your input in discussions and debate. Answer other people\'s question. Introduce yourself in a dedicated post if you want, and get in touch with the rest of the community :)'),],
links: [
{
text: v.$pgettext("Text for link in guide step", 'Latest posts on the forum'),
text: v.$pgettext("Text for link in guide step", 'New posts from the forum'),
url: 'https://socialhub.network/c/funkwhale/l/latest',
}
],
......@@ -217,33 +217,33 @@ export function getTasks (v) {
name: v.$pgettext('Task name', "Translate Funkwhale"),
duration: 15,
icon: "language",
summary: v.$pgettext("Task summary", "Help translate the project in other languages.",),
summary: v.$pgettext("Task summary", 'Help translate the project to other languages.'),
slug: 'translate',
skills: [
{
name: v.$pgettext("Skill name", 'English comprehension'),
summary: v.$pgettext("Skill summary", "You need to understand written english in order to translate Funkwhale in another language.")
name: v.$pgettext("Skill name", 'Comprehend English'),
summary: v.$pgettext("Skill summary", "You need to understand written English to translate Funkwhale to another language.")
},
{
name: v.$pgettext("Skill name", 'Fluency in another language'),
summary: v.$pgettext("Skill summary", "You need to be fluent in another language to translate Funkwhale in that language.")
name: v.$pgettext("Skill name", 'Be fluent in another language'),
summary: v.$pgettext("Skill summary", "Good, you meet the requirements of translating Funkwhale into that language.")
},
],
steps: [
{
title: v.$pgettext("Guide step title", 'Create your Gitlab Account'),
content: [v.$pgettext("Guide step content", 'You need a Gitlab on dev.funkwhale.audio account to work on the translations. Skip this step if you already have one.'),],
title: v.$pgettext("Guide step title", 'Create your Contributor Account'),
content: [v.$pgettext("Guide step content", 'A Gitlab on dev.funkwhale.audio will also work on translate.funkwhale.audio.'),],
links: [
{
icon: 'gitlab',
text: v.$pgettext("Text for link in guide step", 'Create your Gitlab account'),
text: v.$pgettext("Text for link in guide step", 'Create your GitLab account'),
to: {name: 'guide', params: {slug: 'gitlab-account'}},
}
]
},
{
title: v.$pgettext("Guide step title", 'Review the translation guidelines'),
content: [v.$pgettext("Guide step content", "We maintain some guidelines for translators to ensure we have consistent wording and translations accross languages and components. Take a moment to read this document."),],
content: [v.$pgettext("Guide step content", "Translator guidelines are available to ensure consistency across languages and components. Take a moment to read this document."),],
links: [
{
text: v.$pgettext("Text for link in guide step", 'Translation guidelines'),
......@@ -252,8 +252,8 @@ export function getTasks (v) {
],
},
{
title: v.$pgettext("Guide step title", 'Chose the project you want to translate'),
content: [v.$pgettext("Guide step content", "Funkwhale is made of several projects, also known as components in Weblate's terminology. Choose the component you want to translate, or, if you don't know which one to pick, choose the \"Contribute\" component to translate this website."),],
title: v.$pgettext("Guide step title", 'Choose the project you want to translate'),
content: [v.$pgettext("Guide step content", "Funkwhale is made up of several projects, also known as components in Weblate's terminology. Pick your favourite, or \"Contribute\" to translate this website."),],
links: [
{
text: v.$pgettext("Text for link in guide step", 'List of translatable components'),
......@@ -264,13 +264,13 @@ export function getTasks (v) {
{
type: 'image',
url: '/assets/guides/translate/component-list.png',
caption: v.$pgettext("Task image caption", 'List of available components with translation progress')
caption: v.$pgettext("Task image caption", 'List of available components and translation progress for each')
},
]
},
{
title: v.$pgettext("Guide step title", 'Chose the target language'),
content: [v.$pgettext("Guide step content", "Each component is translated in many languages. Pick one language your are fluent in."),],
title: v.$pgettext("Guide step title", 'Choose the target language'),
content: [v.$pgettext("Guide step content", "Each component is translated in many languages. Pick a language your are fluent in."),],
links: [
{
text: v.$pgettext("Text for link in guide step", 'List of already available languages'),
......@@ -281,16 +281,16 @@ export function getTasks (v) {
{
type: 'image',
url: '/assets/guides/translate/language-list.png',
caption: v.$pgettext("Task image caption", 'List of available languages with translation progress')
caption: v.$pgettext("Task image caption", 'List of available languages with progressing translations')
},
]
},
{
title: v.$pgettext("Guide step title", 'Login on Weblate'),
content: [v.$pgettext("Guide step content", 'Weblate is the place where translation happen. Login with your Gitlab account using the "Third party login" section on the right side of the login form to start translating.'),],
title: v.$pgettext("Guide step title", 'Log in on Weblate'),
content: [v.$pgettext("Guide step content", 'Weblate is where translations happen. Log in with your GitLab account using the "Third party login" section on the right to start translating.'),],
links: [
{
text: v.$pgettext("Text for link in guide step", 'Login on Weblate with Gitlab'),
text: v.$pgettext("Text for link in guide step", 'Log in on Weblate with GitLab'),
url: 'https://translate.funkwhale.audio/accounts/login/?next=/projects/funkwhale/front/'
}
],
......@@ -298,7 +298,7 @@ export function getTasks (v) {
{
type: 'image',
url: '/assets/guides/translate/login-form.png',
caption: v.$pgettext("Task image caption", "Weblate's login form with Gitlab login on the right")
caption: v.$pgettext("Task image caption", "Weblate's login form with GitLab login on the right")
},
]
},
......@@ -320,7 +320,7 @@ export function getTasks (v) {
]
},
{
title: v.$pgettext("Guide step title", 'Click on the translate button'),
title: v.$pgettext("Guide step title", 'Click "Translate"'),
content: [v.$pgettext("Guide step content", 'Click on the "translate" button in the last column of the languages table to start working.'),],
media: [
{
......@@ -332,7 +332,7 @@ export function getTasks (v) {
},
{
title: v.$pgettext("Guide step title", 'Submit your first translation'),
content: [v.$pgettext("Guide step content", "Weblate will now present you with text that need translation or corrections. If you're confident submitting a translation, fill-in your proposal and submit the form. If you're not sure, you can leave a comment with a suggestion or simply skip to the next item."),],
content: [v.$pgettext("Guide step content", "Weblate will now present you with text in need of translation or correction. Confidently submit a translation, or fill-in your proposal and submit the form. If you're not sure at all, comment or move to the next string."),],
media: [
{
type: 'image',
......@@ -347,28 +347,28 @@ export function getTasks (v) {
{
type: 'image',
url: '/assets/guides/translate/translation-form-action-bar.png',
caption: v.$pgettext("Task image caption", "The top bar help you navigate the translations and see your progress")
caption: v.$pgettext("Task image caption", "The top bar helps you navigate the translations and see your progress")
},
{
type: 'image',
url: '/assets/guides/translate/translation-form-check.png',
caption: v.$pgettext("Task image caption", "The checks area tells you what you need to do for a given translation")
caption: v.$pgettext("Task image caption", "The \"Checks\" area tells you what you need to do for a given translation")
},
{
type: 'image',
url: '/assets/guides/translate/translation-form-menu.png',
caption: v.$pgettext("Task image caption", "Use the submenu to browse similar translations, see other translators comments and suggestions and past activity")
caption: v.$pgettext("Task image caption", "Use the submenu to browse similar translations, see other translators comments, suggestions and past activity")
},
{
type: 'image',
url: '/assets/guides/translate/translation-form-source.png',
caption: v.$pgettext("Task image caption", 'The "source information" section can help you find context about a translation, and see the source-code in which the translation is used')
caption: v.$pgettext("Task image caption", 'The "Source information" section can help you find contextual info about a translation, and see the source-code in which the translation is used')
},
]
},
{
title: v.$pgettext("Guide step title", 'Stop here... or continue!'),
content: [v.$pgettext("Guide step content", "You can repeat the previous step until you run out of time. Each new or improved translation makes the project better, but you don't have to translate everything!"),],
title: v.$pgettext("Guide step title", 'Stop here or continue!'),
content: [v.$pgettext("Guide step content", "You can repeat the previous step until you run out of time. Each new or improved translation makes the project better."),],
},
]
},
......@@ -376,31 +376,31 @@ export function getTasks (v) {
name: v.$pgettext('Task name', "Report a bug"),
icon: "bug",
duration: 15,
summary: v.$pgettext("Task summary", "Report us typos, display issues, or other unexpected bebaviour so we can fix it."),
summary: v.$pgettext("Task summary", "Report typos, display issues, or other unexpected bebaviour, or fix it yourself."),
},
{
name: v.$pgettext('Task name', "Review the documentation"),
icon: "search",
duration: 15,
summary: v.$pgettext("Task summary", "Ensure our documentation is accurate, understandable and up-to-date."),
summary: v.$pgettext("Task summary", "Ensure the documentation is accurate, understandable and up-to-date."),
},
{
name: v.$pgettext('Task name', "Publish audio content"),
icon: "music",
duration: 15,
summary: v.$pgettext("Task summary", "Upload content with an open licence, or your own work, on the network."),
summary: v.$pgettext("Task summary", "Upload content with a libre licence, or your own work, on the network."),
},
{
name: v.$pgettext('Task name', "Submit patches for the documentation"),
icon: "pencil",
duration: 30,
summary: v.$pgettext("Task summary", "Fix issues and improve the quality of our documentation."),
summary: v.$pgettext("Task summary", "Fix issues and improve the quality of the documentation."),
},
{
name: v.$pgettext('Task name', "Request a feature"),
icon: "question",
duration: 30,
summary: v.$pgettext("Task summary", "Is something missing in Funkwhale? Write a feature request and launch a discussion about it."),
summary: v.$pgettext("Task summary", "Is something missing in Funkwhale? Write a feature request and spark a discussion about it."),
},
{
name: v.$pgettext('Task name', "Support other community members"),
......@@ -412,13 +412,13 @@ export function getTasks (v) {
name: v.$pgettext('Task name', "Review submitted patches"),
icon: "eye",
duration: 30,
summary: v.$pgettext("Task summary", "Review work submitted by other contributors to increase the software's quality."),
summary: v.$pgettext("Task summary", "Review work submitted by other contributors to increase software quality."),
},
{
name: v.$pgettext('Task name', "Write about Funkwhale"),
icon: "pencil",
duration: 60,
summary: v.$pgettext("Task summary", "Do you own a blog or a site? Writing about Funkwhale is a great way to help the project grow and attract new users and contributors."),
summary: v.$pgettext("Task summary", "Do you own a blog or are you the media? Indemnify yourself by writing about Funkwhale to help the project attain eyeballs."),
},
{
name: v.$pgettext('Task name', "Solve a small issue"),
......@@ -436,13 +436,13 @@ export function getTasks (v) {
name: v.$pgettext('Task name', "Audit Funkwhale's security"),
icon: "user-secret",
duration: 120,
summary: v.$pgettext("Task summary", "Investigate and report possible security issues, and help us solve them before they affect our users."),
summary: v.$pgettext("Task summary", "Investigate and report possible security issues, and help solve them before users are affected."),
},
{
name: v.$pgettext('Task name', "Integrate Funkwhale with other projects"),
icon: "file-code-o",
duration: 9999,
summary: v.$pgettext("Task summary", "Write an app, an alternative client for Funkwhale, or integrate Funkwhale with third-party projects."),
summary: v.$pgettext("Task summary", "Write an app, an alternative client for Funkwhale, or integrate Funkwhale in third-party projects."),
},
// hidden tasks (on home) that can be included in other guides
{
......@@ -451,14 +451,14 @@ export function getTasks (v) {
duration: 5,
unlisted: true,
slug: 'gitlab-account',
summary: v.$pgettext("Task summary", "Create your GitLab account on dev.funkwhale.audio to start working on various area of the projects.",),
summary: v.$pgettext("Task summary", 'Create your GitLab account on dev.funkwhale.audio to start working on various projects.'),
steps: [
{
title: v.$pgettext("Guide step title", 'Visit dev.funkwhale.audio'),
content: [v.$pgettext("Guide step content", 'Our GitLab instance is hosted at dev.funkwhale.audio. You have to sign-up here, using your email or a third-party-provider.'),],
content: [v.$pgettext("Guide step content", 'The Funkwhale GitLab instance is hosted at dev.funkwhale.audio. You have to sign-up here, using your e-mail account or by way of a third-party token provider.'),],
links: [
{
text: v.$pgettext("Text for link in guide step", 'Signup on dev.funkwhale.audio'),
text: v.$pgettext("Text for link in guide step", 'Sign up on dev.funkwhale.audio'),
url: 'https://dev.funkwhale.audio/users/sign_in',
},
],
......@@ -471,18 +471,18 @@ export function getTasks (v) {
]
},
{
title: v.$pgettext("Guide step title", 'Verify your email address'),
content: [v.$pgettext("Guide step content", "Shortly after signup, you should receive a confirmation email containing an activation link. Click on this link to activate your account. If you don't receive the email after a few minutes, you can request another one."),],
title: v.$pgettext("Guide step title", 'Verify your e-mail address'),
content: [v.$pgettext("Guide step content", "Shortly after signup, you should receive a confirmation e-mail containing an activation link. Click it to activate your account. Request another one if you did not receive the e-mail within a few minutes."),],
links: [
{
text: v.$pgettext("Text for link in guide step", 'Request another activation email'),
text: v.$pgettext("Text for link in guide step", 'Request another activation e-mail'),
url: 'https://dev.funkwhale.audio/users/almost_there',
}
],
},
{
title: v.$pgettext("Guide step title", 'Login using your new account'),
content: [v.$pgettext("Guide step content", "Login on your new account to ensure everything works properly."),],
title: v.$pgettext("Guide step title", 'Log in'),
content: [v.$pgettext("Guide step content", "Log in using your new account to ensure everything works properly."),],
links: [
{
text: v.$pgettext("Text for link in guide step", 'Login form'),
......@@ -532,7 +532,7 @@ export function getTasks (v) {
steps: [
{
title: v.$pgettext("Guide step title", 'Create your account on socialhub.network'),
content: [v.$pgettext("Guide step content", 'Our forum software is named Discourse, and is hosted at socialhub.network. We share this forum with other projects such as Prismo and PixelFed. Click on the "Sign Up" button in the top bar and fill in your information.'),],
content: [v.$pgettext("Guide step content", 'Our forum runs on Discourse, hosted at socialhub.network. It is shared with other projects such as Prismo and PixelFed. Click on the "Sign Up" button in the top bar and fill in your info.'),],
links: [
{
text: v.$pgettext("Text for link in guide step", 'Signup on socialhub.network'),
......@@ -553,12 +553,12 @@ export function getTasks (v) {
]
},
{
title: v.$pgettext("Guide step title", 'Verify your email address'),
content: [v.$pgettext("Guide step content", "Shortly after signup, you should receive a confirmation email containing an activation link. Click on this link to activate your account. If you don't receive the email after a few minutes, you can request another one."),],
title: v.$pgettext("Guide step title", 'Verify your e-mail address'),
content: [v.$pgettext("Guide step content", "Shortly after signup, you should receive a confirmation e-mail containing an activation link. Click it to activate your account. Request another one if you did not receive the e-mail within a few minutes."),],
},
{
title: v.$pgettext("Guide step title", 'Login using your new account'),
content: [v.$pgettext("Guide step content", "Login on your new account to ensure everything works properly."),],
title: v.$pgettext("Guide step title", 'Log in using your new account'),
content: [v.$pgettext("Guide step content", "Log in on your new account to ensure everything works properly."),],
links: [
{
text: v.$pgettext("Text for link in guide step", 'Login form'),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment