Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Marcin Mikołajczak
funkwhale
Commits
8f019863
Commit
8f019863
authored
Jul 01, 2018
by
Eliot Berriot
Browse files
Merge branch 'typo' into 'develop'
Fixed typo See merge request
funkwhale/funkwhale!295
parents
0ef63bea
93da9745
Changes
2
Hide whitespace changes
Inline
Side-by-side
front/scripts/i18n-weblate-to-origin.sh
0 → 100755
View file @
8f019863
#!/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
"
front/src/components/PageNotFound.vue
View file @
8f019863
...
...
@@ -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>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment