Merge branch 'master' into glitch-soc/merge-upstream
This commit is contained in:
Thibaut Girka
@ -204,6 +204,7 @@
|
||||
"keyboard_shortcuts.search": "fucalizà nant'à l'area di circata",
|
||||
"keyboard_shortcuts.start": "per apre a culonna \"per principià\"",
|
||||
"keyboard_shortcuts.toggle_hidden": "vede/piattà u testu daretu à l'avertimentu CW",
|
||||
"keyboard_shortcuts.toggle_sensitivity": "vede/piattà i media",
|
||||
"keyboard_shortcuts.toot": "scrive un novu statutu",
|
||||
"keyboard_shortcuts.unfocus": "ùn fucalizà più l'area di testu",
|
||||
"keyboard_shortcuts.up": "cullà indè a lista",
|
||||
@ -236,6 +237,7 @@
|
||||
"navigation_bar.favourites": "Favuriti",
|
||||
"navigation_bar.filters": "Parolle silenzate",
|
||||
"navigation_bar.follow_requests": "Dumande d'abbunamentu",
|
||||
"navigation_bar.follows_and_followers": "Abbunati è abbunamenti",
|
||||
"navigation_bar.info": "À prupositu di u servore",
|
||||
"navigation_bar.keyboard_shortcuts": "Accorte cù a tastera",
|
||||
"navigation_bar.lists": "Liste",
|
||||
|
||||
@ -236,6 +236,7 @@
|
||||
"navigation_bar.favourites": "Oblíbené",
|
||||
"navigation_bar.filters": "Skrytá slova",
|
||||
"navigation_bar.follow_requests": "Požadavky o sledování",
|
||||
"navigation_bar.follows_and_followers": "Sledovaní a sledující",
|
||||
"navigation_bar.info": "O tomto serveru",
|
||||
"navigation_bar.keyboard_shortcuts": "Klávesové zkratky",
|
||||
"navigation_bar.lists": "Seznamy",
|
||||
|
||||
@ -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": [
|
||||
{
|
||||
|
||||
@ -208,6 +208,7 @@
|
||||
"keyboard_shortcuts.search": "to focus search",
|
||||
"keyboard_shortcuts.start": "to open \"get started\" column",
|
||||
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
|
||||
"keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
|
||||
"keyboard_shortcuts.toot": "to start a brand new toot",
|
||||
"keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
|
||||
"keyboard_shortcuts.up": "to move up in the list",
|
||||
@ -240,6 +241,7 @@
|
||||
"navigation_bar.favourites": "Favourites",
|
||||
"navigation_bar.filters": "Muted words",
|
||||
"navigation_bar.follow_requests": "Follow requests",
|
||||
"navigation_bar.follows_and_followers": "Follows and followers",
|
||||
"navigation_bar.info": "About this server",
|
||||
"navigation_bar.keyboard_shortcuts": "Hotkeys",
|
||||
"navigation_bar.lists": "Lists",
|
||||
|
||||
@ -208,6 +208,7 @@
|
||||
"keyboard_shortcuts.search": "検索欄に移動",
|
||||
"keyboard_shortcuts.start": "\"スタート\" カラムを開く",
|
||||
"keyboard_shortcuts.toggle_hidden": "CWで隠れた文を見る/隠す",
|
||||
"keyboard_shortcuts.toggle_sensitivity": "非表示のメディアを見る/隠す",
|
||||
"keyboard_shortcuts.toot": "新規トゥート",
|
||||
"keyboard_shortcuts.unfocus": "トゥート入力欄・検索欄から離れる",
|
||||
"keyboard_shortcuts.up": "カラム内一つ上に移動",
|
||||
@ -240,6 +241,7 @@
|
||||
"navigation_bar.favourites": "お気に入り",
|
||||
"navigation_bar.filters": "フィルター設定",
|
||||
"navigation_bar.follow_requests": "フォローリクエスト",
|
||||
"navigation_bar.follows_and_followers": "フォロー・フォロワー",
|
||||
"navigation_bar.info": "このサーバーについて",
|
||||
"navigation_bar.keyboard_shortcuts": "ホットキー",
|
||||
"navigation_bar.lists": "リスト",
|
||||
|
||||
Reference in New Issue
Block a user