tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Thibaut Girka
2019-05-30 13:31:01 +02:00
parent 6c0428b7d8 dee4f1878d
commit 06036081a0
17 changed files with 407 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

139
app/javascript/mastodon/locales/defaultMessages.json
View File

@ -1356,46 +1356,6 @@
{
"defaultMessage": "Profile directory",
"id": "getting_started.directory"
},
{
"defaultMessage": "Invite people",
"id": "getting_started.invite"
},
{
"defaultMessage": "Hotkeys",
"id": "navigation_bar.keyboard_shortcuts"
},
{
"defaultMessage": "Security",
"id": "getting_started.security"
},
{
"defaultMessage": "About this server",
"id": "navigation_bar.info"
},
{
"defaultMessage": "Mobile apps",
"id": "navigation_bar.apps"
},
{
"defaultMessage": "Terms of service",
"id": "getting_started.terms"
},
{
"defaultMessage": "Developers",
"id": "getting_started.developers"
},
{
"defaultMessage": "Documentation",
"id": "getting_started.documentation"
},
{
"defaultMessage": "Logout",
"id": "navigation_bar.logout"
},
{
"defaultMessage": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
"id": "getting_started.open_source_notice"
}
],
"path": "app/javascript/mastodon/features/getting_started/index.json"
@ -1599,6 +1559,10 @@
"defaultMessage": "to show/hide text behind CW",
"id": "keyboard_shortcuts.toggle_hidden"
},
{
"defaultMessage": "to show/hide media",
"id": "keyboard_shortcuts.toggle_sensitivity"
},
{
"defaultMessage": "to move up in the list",
"id": "keyboard_shortcuts.up"
@ -2253,6 +2217,60 @@
],
"path": "app/javascript/mastodon/features/ui/components/embed_modal.json"
},
{
"descriptors": [
{
"defaultMessage": "Follow requests",
"id": "navigation_bar.follow_requests"
}
],
"path": "app/javascript/mastodon/features/ui/components/follow_requests_nav_link.json"
},
{
"descriptors": [
{
"defaultMessage": "Invite people",
"id": "getting_started.invite"
},
{
"defaultMessage": "Hotkeys",
"id": "navigation_bar.keyboard_shortcuts"
},
{
"defaultMessage": "Security",
"id": "getting_started.security"
},
{
"defaultMessage": "About this server",
"id": "navigation_bar.info"
},
{
"defaultMessage": "Mobile apps",
"id": "navigation_bar.apps"
},
{
"defaultMessage": "Terms of service",
"id": "getting_started.terms"
},
{
"defaultMessage": "Developers",
"id": "getting_started.developers"
},
{
"defaultMessage": "Documentation",
"id": "getting_started.documentation"
},
{
"defaultMessage": "Logout",
"id": "navigation_bar.logout"
},
{
"defaultMessage": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
"id": "getting_started.open_source_notice"
}
],
"path": "app/javascript/mastodon/features/ui/components/link_footer.json"
},
{
"descriptors": [
{
@ -2295,6 +2313,47 @@
],
"path": "app/javascript/mastodon/features/ui/components/mute_modal.json"
},
{
"descriptors": [
{
"defaultMessage": "Home",
"id": "tabs_bar.home"
},
{
"defaultMessage": "Notifications",
"id": "tabs_bar.notifications"
},
{
"defaultMessage": "Local",
"id": "tabs_bar.local_timeline"
},
{
"defaultMessage": "Federated",
"id": "tabs_bar.federated_timeline"
},
{
"defaultMessage": "Direct messages",
"id": "navigation_bar.direct"
},
{
"defaultMessage": "Favourites",
"id": "navigation_bar.favourites"
},
{
"defaultMessage": "Lists",
"id": "navigation_bar.lists"
},
{
"defaultMessage": "Preferences",
"id": "navigation_bar.preferences"
},
{
"defaultMessage": "Follows and followers",
"id": "navigation_bar.follows_and_followers"
}
],
"path": "app/javascript/mastodon/features/ui/components/navigation_panel.json"
},
{
"descriptors": [
{