Commit 8f019863 authored by Eliot Berriot's avatar Eliot Berriot
Browse files

Merge branch 'typo' into 'develop'

Fixed typo

See merge request funkwhale/funkwhale!295
parents 0ef63bea 93da9745
#!/bin/bash -eux
integration_branch="translations-integration"
git remote add weblate https://translate.funkwhale.audio/git/funkwhale/front/ || echo "remote already exists"
git fetch weblate
git checkout weblate/develop
git reset --hard weblate/develop
git checkout -b $integration_branch || git checkout $integration_branch
git reset --hard weblate/develop
git push -f origin $integration_branch
echo "Branch created on pushed on origin/$integration_branch"
echo "Open a merge request by visiting https://code.eliotberriot.com/funkwhale/funkwhale/merge_requests/new?merge_request%5Bsource_branch%5D=$integration_branch"
......@@ -5,7 +5,7 @@
<h1 class="ui huge header">
<i class="warning icon"></i>
<div class="content">
<strike><translate>Whale') }}</strike> {{ $gettext('Page not found!</translate>
<translate>Page not found!</translate>
</div>
</h1>
<p><translate>We're sorry, the page you asked for does not exist:</translate></p>
......
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